aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2016-04-11 22:45:14 +0200
committerIngo Bauersachs <ingo@jitsi.org>2016-04-12 23:36:24 +0200
commitc04ba68e09dba9fa3e31bf56a3c27bd179cb71f7 (patch)
tree807cbf3e2e6632f1b1df6f89ed768da2f9b1516a
parente0e0c7f9afd6be5828bfe38f5b3efa0892847fcd (diff)
downloadjitsi-c04ba68e09dba9fa3e31bf56a3c27bd179cb71f7.zip
jitsi-c04ba68e09dba9fa3e31bf56a3c27bd179cb71f7.tar.gz
jitsi-c04ba68e09dba9fa3e31bf56a3c27bd179cb71f7.tar.bz2
Update dependencies
* bccontrib: 1.0 is released on Central * jmork: 1.0.5 is released on Central * bcprov/bcpkix: 1.54 is a prerequisite for newer libjitsi
-rwxr-xr-x.classpath6
-rw-r--r--build.xml8
-rw-r--r--lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jarbin40669 -> 0 bytes
-rw-r--r--lib/installer-exclude/bccontrib-1.0.jarbin0 -> 41570 bytes
-rw-r--r--lib/installer-exclude/bcpkix-jdk15on-1.54.jarbin0 -> 673715 bytes
-rwxr-xr-xlib/installer-exclude/bcpkix-jdk15on-151.jarbin605519 -> 0 bytes
-rw-r--r--lib/installer-exclude/bcprov-jdk15on-1.54.jarbin0 -> 3277268 bytes
-rwxr-xr-xlib/installer-exclude/bcprov-jdk15on-151.jarbin2842667 -> 0 bytes
-rw-r--r--lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jarbin44218 -> 0 bytes
-rw-r--r--lib/installer-exclude/jmork-1.0.5.jarbin0 -> 45171 bytes
10 files changed, 7 insertions, 7 deletions
diff --git a/.classpath b/.classpath
index 8a39b4d..010edcc 100755
--- a/.classpath
+++ b/.classpath
@@ -75,10 +75,10 @@
<classpathentry kind="lib" path="lib/installer-exclude/ymsg_network_v0_67.jar"/>
<classpathentry kind="lib" path="lib/os-specific/mac/growl4j.jar"/>
<classpathentry kind="lib" path="lib/os-specific/mac/OrangeExtensions.jar"/>
- <classpathentry kind="lib" path="lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar" sourcepath="/jmork"/>
- <classpathentry kind="lib" path="lib/installer-exclude/bcprov-jdk15on-151.jar"/>
+ <classpathentry kind="lib" path="lib/installer-exclude/jmork-1.0.5.jar" sourcepath="/jmork"/>
+ <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-SNAPSHOT.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/jcalendar-1.4.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/hsqldb.jar"/>
diff --git a/build.xml b/build.xml
index 2369c36..c31cbb3 100644
--- a/build.xml
+++ b/build.xml
@@ -1107,7 +1107,6 @@
<copy file="${lib.noinst}/libjitsi-1.0-SNAPSHOT.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}/bcpkix-jdk15on-151.jar" tofile="${bundles.dest}/bcpkix.jar"/>
<copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
<copy file="${lib.noinst}/hsqldb.jar" tofile="${bundles.dest}/hsqldb.jar"/>
<copy file="${lib.noinst}/irc-api-1.0.jar" tofile="${bundles.dest}/irc-api-1.0.jar"/>
@@ -1118,8 +1117,10 @@
<copy file="${lib.noinst}/httpclient-osgi-4.2.3.jar" tofile="${bundles.dest}/httpclient.jar"/>
<copy file="${lib.noinst}/httpcore-osgi-4.2.3.jar" tofile="${bundles.dest}/httpcore.jar"/>
<copy file="${lib.noinst}/sdes4j-1.1.3.jar" tofile="${bundles.dest}/sdes4j.jar"/>
- <copy file="${lib.noinst}/bcprov-jdk15on-151.jar" tofile="${bundles.dest}/bouncycastle.jar"/>
- <copy file="${lib.noinst}/bccontrib-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/bccontrib.jar"/>
+ <copy file="${lib.noinst}/bcpkix-jdk15on-1.54.jar" tofile="${bundles.dest}/bcpkix.jar"/>
+ <copy file="${lib.noinst}/bcprov-jdk15on-1.54.jar" tofile="${bundles.dest}/bouncycastle.jar"/>
+ <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"/>
</target>
<!--BUNDLE-SC-LAUNCHER-->
@@ -2775,7 +2776,6 @@ org.bouncycastle.util"/>
<zipfileset dir="${dest}/net/java/sip/communicator/plugin/thunderbird"
prefix="net/java/sip/communicator/plugin/thunderbird" />
</jar>
- <copy file="${lib.noinst}/jmork-1.0.5-SNAPSHOT.jar" tofile="${bundles.dest}/jmork.jar"/>
</target>
<target name="bundle-certificate">
diff --git a/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar b/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar
deleted file mode 100644
index 719078e..0000000
--- a/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/bccontrib-1.0.jar b/lib/installer-exclude/bccontrib-1.0.jar
new file mode 100644
index 0000000..47a6a89
--- /dev/null
+++ b/lib/installer-exclude/bccontrib-1.0.jar
Binary files differ
diff --git a/lib/installer-exclude/bcpkix-jdk15on-1.54.jar b/lib/installer-exclude/bcpkix-jdk15on-1.54.jar
new file mode 100644
index 0000000..86f7f0b
--- /dev/null
+++ b/lib/installer-exclude/bcpkix-jdk15on-1.54.jar
Binary files differ
diff --git a/lib/installer-exclude/bcpkix-jdk15on-151.jar b/lib/installer-exclude/bcpkix-jdk15on-151.jar
deleted file mode 100755
index 57e0080..0000000
--- a/lib/installer-exclude/bcpkix-jdk15on-151.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/bcprov-jdk15on-1.54.jar b/lib/installer-exclude/bcprov-jdk15on-1.54.jar
new file mode 100644
index 0000000..bd95185
--- /dev/null
+++ b/lib/installer-exclude/bcprov-jdk15on-1.54.jar
Binary files differ
diff --git a/lib/installer-exclude/bcprov-jdk15on-151.jar b/lib/installer-exclude/bcprov-jdk15on-151.jar
deleted file mode 100755
index 4076e11..0000000
--- a/lib/installer-exclude/bcprov-jdk15on-151.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar b/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar
deleted file mode 100644
index 671c474..0000000
--- a/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/jmork-1.0.5.jar b/lib/installer-exclude/jmork-1.0.5.jar
new file mode 100644
index 0000000..f87ee11
--- /dev/null
+++ b/lib/installer-exclude/jmork-1.0.5.jar
Binary files differ