aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2017-01-14 16:22:30 +0100
committerIngo Bauersachs <ingo@jitsi.org>2017-01-14 16:26:34 +0100
commit712e73d685f808048d8a6e0f51554eb07daccc74 (patch)
treea6c9219233c21a31e86640dab4003016ca8a4bb5
parent2b819cf74759aff7842698e7abd403798c4dd441 (diff)
downloadjitsi-712e73d685f808048d8a6e0f51554eb07daccc74.zip
jitsi-712e73d685f808048d8a6e0f51554eb07daccc74.tar.gz
jitsi-712e73d685f808048d8a6e0f51554eb07daccc74.tar.bz2
Update libraries
jitsi/ice4j@cefd96450947bad93eff9d4b5fc95af25dcb9ae3 Jenkins build 302 jitsi/libjitsi@48ce8b6848a6ed76f9e80045f29a7f4940230e28 Jenkins build 211 jitsi/jitsi-lgpl-dependencies@a747366e838b623a2c79cb4fefc120d2fc8990e7 local build
-rwxr-xr-x.classpath4
-rw-r--r--build.xml4
-rw-r--r--lib/installer-exclude/ice4j-1.1-20160706.192041-13.jarbin473184 -> 0 bytes
-rw-r--r--lib/installer-exclude/ice4j-2.0-20170111.193659-7.jarbin0 -> 500574 bytes
-rw-r--r--lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jarbin7903378 -> 7903428 bytes
-rw-r--r--lib/installer-exclude/libjitsi-1.0-20170110.164740-224.jar (renamed from lib/installer-exclude/libjitsi-1.0-20170107.144734-222.jar)bin9007818 -> 9007861 bytes
-rw-r--r--nbproject/project.xml2
7 files changed, 5 insertions, 5 deletions
diff --git a/.classpath b/.classpath
index 61d9df1..303f939 100755
--- a/.classpath
+++ b/.classpath
@@ -30,7 +30,7 @@
<classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpclient-osgi-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpcore-osgi-4.2.3.jar"/>
- <classpathentry kind="lib" path="lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar" sourcepath="/ice4j/src/main/java"/>
+ <classpathentry kind="lib" path="lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar" sourcepath="/ice4j/src/main/java"/>
<classpathentry kind="lib" path="lib/installer-exclude/sdp-api-1.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/sip-api-1.2-1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar" sourcepath="/jain-sip/src">
@@ -55,7 +55,7 @@
<attribute name="javadoc_location" value="http://dbus.freedesktop.org/doc/dbus-java/api/"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="lib/installer-exclude/libjitsi-1.0-20170107.144734-222.jar" sourcepath="/libjitsi/src"/>
+ <classpathentry kind="lib" path="lib/installer-exclude/libjitsi-1.0-20170110.164740-224.jar" sourcepath="/libjitsi/src"/>
<classpathentry kind="lib" path="lib/bundle/log4j.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>
diff --git a/build.xml b/build.xml
index abd86a9..81e44a2 100644
--- a/build.xml
+++ b/build.xml
@@ -978,7 +978,7 @@
<!-- Copying of all unmodified libraries that are already bundles -->
<target name="bundle-bundles">
- <copy file="${lib.noinst}/libjitsi-1.0-20170107.144734-222.jar" tofile="${bundles.dest}/libjitsi.jar"/>
+ <copy file="${lib.noinst}/libjitsi-1.0-20170110.164740-224.jar" tofile="${bundles.dest}/libjitsi.jar"/>
<copy file="${lib.noinst}/fmj-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/fmj.jar"/>
<copy file="${lib.noinst}/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-lgpl-dependencies.jar"/>
<copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
@@ -996,7 +996,7 @@
<copy file="${lib.noinst}/bccontrib-1.0.jar" tofile="${bundles.dest}/bccontrib.jar"/>
<copy file="${lib.noinst}/jmork-1.0.5.jar" tofile="${bundles.dest}/jmork.jar"/>
<copy file="${lib.noinst}/weupnp-0.1.4.jar" tofile="${bundles.dest}/weupnp.jar"/>
- <copy file="${lib.noinst}/ice4j-1.1-20160706.192041-13.jar" tofile="${bundles.dest}/ice4j.jar"/>
+ <copy file="${lib.noinst}/ice4j-2.0-20170111.193659-7.jar" tofile="${bundles.dest}/ice4j.jar"/>
<copy file="${lib.noinst}/sdp-api-1.0.jar" tofile="${bundles.dest}/sdp-api.jar"/>
<copy file="${lib.noinst}/sip-api-1.2-1.2.jar" tofile="${bundles.dest}/sip-api.jar"/>
<copy file="${lib.noinst}/java-sdp-nist-bridge-1.2.jar" tofile="${bundles.dest}/java-sdp-nist-bridge.jar"/>
diff --git a/lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar b/lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar
deleted file mode 100644
index 5c0a83e..0000000
--- a/lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar b/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar
new file mode 100644
index 0000000..752334b
--- /dev/null
+++ b/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar
Binary files differ
diff --git a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
index 257e3ed..36202ae 100644
--- a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/lib/installer-exclude/libjitsi-1.0-20170107.144734-222.jar b/lib/installer-exclude/libjitsi-1.0-20170110.164740-224.jar
index 4313b83..4c55d46 100644
--- a/lib/installer-exclude/libjitsi-1.0-20170107.144734-222.jar
+++ b/lib/installer-exclude/libjitsi-1.0-20170110.164740-224.jar
Binary files differ
diff --git a/nbproject/project.xml b/nbproject/project.xml
index bc1138b..05e3010 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.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-20170107.144734-222.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.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>