aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2014-01-12 14:15:30 +0100
committerIngo Bauersachs <ingo@jitsi.org>2014-01-12 14:15:30 +0100
commite7cd23f4345012d397e9bfe3a0bfd660ba1c100d (patch)
tree465b363dbd602dd40f33eaa7a46abf9817846973
parentd25350c7a6f90875070b5784421220fb22f4a169 (diff)
downloadjitsi-e7cd23f4345012d397e9bfe3a0bfd660ba1c100d.zip
jitsi-e7cd23f4345012d397e9bfe3a0bfd660ba1c100d.tar.gz
jitsi-e7cd23f4345012d397e9bfe3a0bfd660ba1c100d.tar.bz2
Update Google Collections RC1 to Guava 15
-rwxr-xr-x.classpath2
-rw-r--r--build.xml11
-rw-r--r--lib/felix.client.run.properties3
-rw-r--r--lib/felix.unit.test.properties3
-rw-r--r--lib/installer-exclude/google-collect-1.0-rc1.jarbin548821 -> 0 bytes
-rw-r--r--lib/installer-exclude/guava-15.0.jarbin0 -> 2172168 bytes
6 files changed, 13 insertions, 6 deletions
diff --git a/.classpath b/.classpath
index f873dfd..1304681 100755
--- a/.classpath
+++ b/.classpath
@@ -27,7 +27,7 @@
<classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-3.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-meta-3.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/gdata-core-1.0.jar"/>
- <classpathentry kind="lib" path="lib/installer-exclude/google-collect-1.0-rc1.jar"/>
+ <classpathentry kind="lib" path="lib/installer-exclude/guava-15.0.jar"/>
<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"/>
diff --git a/build.xml b/build.xml
index ec40adb..49170e2 100644
--- a/build.xml
+++ b/build.xml
@@ -1086,8 +1086,9 @@
bundle-globalshortcut,bundle-plugin-msofficecomm,bundle-libjitsi,
bundle-customcontactactions, bundle-phonenumbercontactsource,
bundle-demuxcontactsource, bundle-muc,
- bundle-desktoputil,bundle-globaldisplaydetails,
- bundle-plugin-propertieseditor,bundle-plugin-accountinfo"/>
+ bundle-desktoputil,bundle-globaldisplaydetails,
+ bundle-plugin-propertieseditor,bundle-plugin-accountinfo,
+ bundle-guava"/>
<!--BUNDLE-SC-LAUNCHER-->
<target name="bundle-sc-launcher">
@@ -1364,7 +1365,6 @@
prefix="net/java/sip/communicator/service/googlecontacts"/>
<zipfileset dir="${dest}/net/java/sip/communicator/impl/googlecontacts"
prefix="net/java/sip/communicator/impl/googlecontacts" />
- <zipfileset src="${lib.noinst}/google-collect-1.0-rc1.jar" prefix=""/>
<zipfileset src="${lib.noinst}/gdata-core-1.0.jar" prefix=""/>
<zipfileset src="${lib.noinst}/gdata-contacts-3.0.jar" prefix=""/>
<zipfileset src="${lib.noinst}/gdata-contacts-meta-3.0.jar" prefix=""/>
@@ -1372,6 +1372,7 @@
<zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/>
</jar>
</target>
+
<!--BUNDLE-GOOGLECONTACTS-SERVICE-->
<target name="bundle-googlecontacts-service">
<jar compress="false" destfile="${bundles.dest}/googlecontacts-service.jar"
@@ -1381,6 +1382,10 @@
</jar>
</target>
+ <target name="bundle-guava">
+ <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
+ </target>
+
<!--BUNDLE-SERVICEBINDER -->
<target name="bundle-servicebinder">
<jar compress="true" destfile="lib/bundle/servicebinder.jar"
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 21b73a8..ec6b8b6 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -33,7 +33,8 @@ felix.auto.start.10= \
reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
reference:file:sc-bundles/bouncycastle.jar \
reference:file:sc-bundles/bccontrib.jar \
- reference:file:sc-bundles/commons-lang.jar
+ reference:file:sc-bundles/commons-lang.jar \
+ reference:file:sc-bundles/guava.jar
# file:lib/bundle/shell.jar \
# file:lib/bundle/servicebinder.jar \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index 0b9323f..bfdea57 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -49,7 +49,8 @@ felix.auto.start.10= \
reference:file:lib/installer-exclude/objenesis-1.2.jar \
reference:file:lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar \
reference:file:sc-bundles/bouncycastle.jar \
- reference:file:sc-bundles/bccontrib.jar
+ reference:file:sc-bundles/bccontrib.jar \
+ reference:file:sc-bundles/guava.jar
# file:lib/bundle/shell.jar \
# file:lib/bundle/bundlerepository.jar \
# file:lib/bundle/servicebinder.jar \
diff --git a/lib/installer-exclude/google-collect-1.0-rc1.jar b/lib/installer-exclude/google-collect-1.0-rc1.jar
deleted file mode 100644
index bc499ee..0000000
--- a/lib/installer-exclude/google-collect-1.0-rc1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/installer-exclude/guava-15.0.jar b/lib/installer-exclude/guava-15.0.jar
new file mode 100644
index 0000000..eb9ef8a
--- /dev/null
+++ b/lib/installer-exclude/guava-15.0.jar
Binary files differ