aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbgrozev <boris@jitsi.org>2016-07-16 06:27:51 -0500
committerIngo Bauersachs <ingo@jitsi.org>2016-07-16 13:27:51 +0200
commit05e7b29dad385cf0c7ccef04fffb4e242890f069 (patch)
tree1444df2e35bf0797ec8de9b013119d581f9406e7
parentedc4ae59d0936ea7d0ae725d7819199030bcf843 (diff)
downloadjitsi-05e7b29dad385cf0c7ccef04fffb4e242890f069.zip
jitsi-05e7b29dad385cf0c7ccef04fffb4e242890f069.tar.gz
jitsi-05e7b29dad385cf0c7ccef04fffb4e242890f069.tar.bz2
Updates libjitsi and ice4j. (#283)
-rw-r--r--build.xml6
-rw-r--r--lib/installer-exclude/ice4j-1.0.jarbin471913 -> 0 bytes
-rw-r--r--lib/installer-exclude/ice4j-1.1-20160706.192041-13.jarbin0 -> 473184 bytes
-rw-r--r--lib/installer-exclude/libjitsi-1.0-20160707.163121-175.jar (renamed from lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar)bin8072237 -> 8075571 bytes
-rw-r--r--m2/pom.xml7
5 files changed, 9 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index 1be362d..ccdf34e 100644
--- a/build.xml
+++ b/build.xml
@@ -465,7 +465,7 @@
<classpath>
<pathelement path="${dest}"/>
- <pathelement location="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar"/>
+ <pathelement location="${lib.noinst}/libjitsi-1.0-20160707.163121-175.jar"/>
</classpath>
</taskdef>
@@ -979,7 +979,7 @@
<!-- Copying of all unmodified libraries that are already bundles -->
<target name="bundle-bundles">
- <copy file="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/libjitsi.jar"/>
+ <copy file="${lib.noinst}/libjitsi-1.0-20160707.163121-175.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"/>
@@ -997,7 +997,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.0.jar" tofile="${bundles.dest}/ice4j.jar"/>
+ <copy file="${lib.noinst}/ice4j-1.1-20160706.192041-13.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.0.jar b/lib/installer-exclude/ice4j-1.0.jar
deleted file mode 100644
index f899c28..0000000
--- a/lib/installer-exclude/ice4j-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar b/lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar
new file mode 100644
index 0000000..5c0a83e
--- /dev/null
+++ b/lib/installer-exclude/ice4j-1.1-20160706.192041-13.jar
Binary files differ
diff --git a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar b/lib/installer-exclude/libjitsi-1.0-20160707.163121-175.jar
index fc4fff0..bd92f39 100644
--- a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/libjitsi-1.0-20160707.163121-175.jar
Binary files differ
diff --git a/m2/pom.xml b/m2/pom.xml
index 9d299b4..9d8e3d7 100644
--- a/m2/pom.xml
+++ b/m2/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>libjitsi</artifactId>
- <version>1.0-20160411.220648-140</version>
+ <version>1.0-20160707.163121-175</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ice4j</artifactId>
+ <version>1.1-20160706.192041-13</version>
</dependency>
</dependencies>
</dependencyManagement>