diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2014-01-12 14:15:30 +0100 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2014-01-12 14:15:30 +0100 |
| commit | e7cd23f4345012d397e9bfe3a0bfd660ba1c100d (patch) | |
| tree | 465b363dbd602dd40f33eaa7a46abf9817846973 /lib | |
| parent | d25350c7a6f90875070b5784421220fb22f4a169 (diff) | |
| download | jitsi-e7cd23f4345012d397e9bfe3a0bfd660ba1c100d.zip jitsi-e7cd23f4345012d397e9bfe3a0bfd660ba1c100d.tar.gz jitsi-e7cd23f4345012d397e9bfe3a0bfd660ba1c100d.tar.bz2 | |
Update Google Collections RC1 to Guava 15
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/felix.client.run.properties | 3 | ||||
| -rw-r--r-- | lib/felix.unit.test.properties | 3 | ||||
| -rw-r--r-- | lib/installer-exclude/google-collect-1.0-rc1.jar | bin | 548821 -> 0 bytes | |||
| -rw-r--r-- | lib/installer-exclude/guava-15.0.jar | bin | 0 -> 2172168 bytes |
4 files changed, 4 insertions, 2 deletions
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 Binary files differdeleted file mode 100644 index bc499ee..0000000 --- a/lib/installer-exclude/google-collect-1.0-rc1.jar +++ /dev/null diff --git a/lib/installer-exclude/guava-15.0.jar b/lib/installer-exclude/guava-15.0.jar Binary files differnew file mode 100644 index 0000000..eb9ef8a --- /dev/null +++ b/lib/installer-exclude/guava-15.0.jar |