Update zrtp4j

Closes #303

jitsi/zrtp4j@beb6723b2e13e27710e38ea9b64f2da8d9a395a3
Local build

5 files changed, 4 insertions, 43 deletions

diff --git a/.classpath b/.classpath
index 303f939..0e8169c 100755
--- a/.classpath
+++ b/.classpath
@@ -72,7 +72,7 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/bcprov-jdk15on-1.54.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/commons-lang3-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/bccontrib-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.4.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/hsqldb.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/irc-api-1.0.jar" sourcepath="lib/installer-exclude/irc-api-1.0-sources.jar"/>
diff --git a/build.xml b/build.xml
index c273fb8..b7e8efb 100644
--- a/build.xml
+++ b/build.xml
@@ -950,7 +950,7 @@
         bundle-update,bundle-plugin-update,
         bundle-plugin-simpleaccreg,bundle-plugin-generalconfig,
         bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service,
-        bundle-argdelegation,bundle-zrtp4j,bundle-json,
+        bundle-argdelegation,bundle-json,
         bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
         bundle-plugin-ippiaccregwizz,
         bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
@@ -1005,6 +1005,7 @@
         <copy file="${lib.noinst}/dnssecjava-1.1.jar" tofile="${bundles.dest}/dnssecjava.jar"/>
         <copy file="${lib.noinst}/jna.jar" tofile="${bundles.dest}/jna.jar"/>
         <copy file="${lib.noinst}/jna-platform.jar" tofile="${bundles.dest}/jna-platform.jar"/>
+        <copy file="${lib.noinst}/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar" tofile="${bundles.dest}/zrtp4j.jar"/>
     </target>
 
     <!--BUNDLE-SC-LAUNCHER-->
@@ -2145,46 +2146,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!--BUNDLE-ZRTP4J -->
-    <target name="bundle-zrtp4j">
-        <jar compress="true" destfile="${bundles.dest}/zrtp4j.jar"
-            filesetmanifest="merge">
-
-            <zipfileset src="${lib.noinst}/zrtp4j-light.jar" prefix=""/>
-            <manifest>
-                <attribute name="Export-Package" value="gnu.java.zrtp,
-gnu.java.zrtp.packets,
-gnu.java.zrtp.utils,
-gnu.java.zrtp.zidfile"/>
-                <attribute name="Import-Package" value="org.bouncycastle.asn1,
-org.bouncycastle.asn1.nist,
-org.bouncycastle.asn1.sec,
-org.bouncycastle.asn1.x9,
-org.bouncycastle.crypto,
-org.bouncycastle.crypto.agreement,
-org.bouncycastle.crypto.digests,
-org.bouncycastle.crypto.engines,
-org.bouncycastle.crypto.generators,
-org.bouncycastle.crypto.macs,
-org.bouncycastle.crypto.modes,
-org.bouncycastle.crypto.params,
-org.bouncycastle.crypto.prng,
-org.jitsi.bccontrib.digests,
-org.jitsi.bccontrib.engines,
-org.jitsi.bccontrib.macs,
-org.jitsi.bccontrib.params,
-org.jitsi.bccontrib.prng,
-org.bouncycastle.math.ec,
-org.bouncycastle.util.encoders,
-org.bouncycastle.util"/>
-                <attribute name="Bundle-Name" value="ZRTP4J"/>
-                <attribute name="Bundle-Description" value="ZRTP for Java library."/>
-                <attribute name="Bundle-Version" value="1.4.5"/>
-                <attribute name="Bundle-SymbolicName" value="gnu.java.zrtp4j"/>
-            </manifest>
-        </jar>
-    </target>
-
     <!--BUNDLE-JSON -->
     <target name="bundle-json">
         <jar compress="true" destfile="${bundles.dest}/json.jar"
diff --git a/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar b/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
new file mode 100644
index 0000000..a7819d2
--- /dev/null
+++ b/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
diff --git a/lib/installer-exclude/zrtp4j-light.jar b/lib/installer-exclude/zrtp4j-light.jar
deleted file mode 100644
index 72797c6..0000000
--- a/lib/installer-exclude/zrtp4j-light.jar
+++ /dev/null
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 05e3010..979d765 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -116,7 +116,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib/felix.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-osgi-4.2.3.jar:lib/installer-exclude/httpcore-osgi-4.2.3.jar:lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar:lib/installer-exclude/irc-api-1.0.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi-1.0-20170110.164740-224.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.4.jar:lib/installer-exclude/zrtp4j-light.jar:lib/installer-exclude/jcalendar-1.4.jar:lib/installer-exclude/bcpkix-jdk15on-151.jar:lib/installer-exclude/bcprov-jdk15on-151.jar:lib/installer-exclude/guava-15.0.jar:lib/installer-exclude/libphonenumber-5.9.jar:lib/installer-exclude/commons-lang3-3.1.jar:lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar</classpath>
+                <classpath mode="compile">lib/felix.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-osgi-4.2.3.jar:lib/installer-exclude/httpcore-osgi-4.2.3.jar:lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar:lib/installer-exclude/irc-api-1.0.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi-1.0-20170110.164740-224.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.4.jar:lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar:lib/installer-exclude/jcalendar-1.4.jar:lib/installer-exclude/bcpkix-jdk15on-151.jar:lib/installer-exclude/bcprov-jdk15on-151.jar:lib/installer-exclude/guava-15.0.jar:lib/installer-exclude/libphonenumber-5.9.jar:lib/installer-exclude/commons-lang3-3.1.jar:lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar</classpath>
                 <built-to>classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>