[jitsi-dev] [jitsi/libjitsi] Remove reference to NIOBlockCipher in CryptoBenchmark (#133)


#1

NIOBlockCipher as been removed in PR #97
commit 18c951646db8d748f17d6aaeb7feec37439266f9

This was missed because CryptoBenchmark.java was excluded
in maven compilation, so don't exclude it

This fixes #132 (Broken Ant build)

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
You can view, comment on, or merge this pull request online at:

  https://github.com/jitsi/libjitsi/pull/133

-- Commit Summary --

  * Remove reference to NIOBlockCipher in CryptoBenchmark

-- File Changes --

    M pom.xml (5)
    M src/org/jitsi/impl/neomedia/transform/srtp/CryptoBenchmark.java (28)

-- Patch Links --

https://github.com/jitsi/libjitsi/pull/133.patch
https://github.com/jitsi/libjitsi/pull/133.diff

···

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/libjitsi/pull/133


#2

Broken Ant build

No:

1. Both the Ant and the Maven build files explicitly exclude CryptoBenchmark. I'm building libjitsi using Maven multiple times a day and it's not broken. I just tested the Ant build and it's not broken either.

2. https://github.com/jitsi/libjitsi/issues/132 talks about Maven (I asked there how the reporter reproduced the break), not Ant.

···

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/libjitsi/pull/133#issuecomment-207468745


#3

@lyubomir this file is in the main source tree, so IMO it should be compilable. Can we exclude the .class from the jar instead of excluding the .java?

In general, is the Ant script still needed? I'm only asking about the Java part, not the JNI and Debian scripts.

···

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/libjitsi/pull/133#issuecomment-207472862


#4

@ibauersachs, I'm working on merging this PR. I merely corrected some of the incorrect statements in this PR and the respective issue.

···

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/libjitsi/pull/133#issuecomment-207474668


#5

@@ -83,11 +83,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/jitsi/impl/neomedia/transform/srtp/CryptoBenchmark.java</exclude>
- </excludes>
- </configuration>
       </plugin>

I'm working on merging this PR so please don't touch it. But I want to state that I don't like it because it's incomplete and I have to spend non-trivial merge time on a non-issue (or at least an issue with very low priority). (1) Since you've removed the configuration tag, the whole plugin tag has become obsolete. (2) The discussion of whether the Ant build script is necessary is a different question out of the scope of this PR so, since you've removed the exclusion in the Maven file, it should be removed from the Ant file as well. Again, I'll do these so that I can merge this PR and be done with it.

···

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/libjitsi/pull/133/files/d6a900a352b75c0ce7a6585ba6d6ed6ae5b91cf0#r59042391


#6

Merged #133.

···

---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/libjitsi/pull/133#event-620315396