aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordamencho <damencho@jitsi.org>2017-01-31 10:17:07 -0600
committerdamencho <damencho@jitsi.org>2017-01-31 10:17:07 -0600
commitbc3f0942854004a228ecb8aa7678496ec0b3e14e (patch)
treeef615b72b2c3967eea88b56de4657722948c26a0 /lib
parent695cc916086284c23626b11657f8271a96cf46ab (diff)
downloadjitsi-bc3f0942854004a228ecb8aa7678496ec0b3e14e.zip
jitsi-bc3f0942854004a228ecb8aa7678496ec0b3e14e.tar.gz
jitsi-bc3f0942854004a228ecb8aa7678496ec0b3e14e.tar.bz2
Splits jitsi-lgpl-dependencies into two jars.
Diffstat (limited to 'lib')
-rw-r--r--lib/felix.client.run.properties3
-rw-r--r--lib/felix.unit.test.properties3
-rw-r--r--lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jarbin0 -> 7862639 bytes
-rw-r--r--lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jarbin7903428 -> 46467 bytes
4 files changed, 4 insertions, 2 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index d5d8889..c9cb60b 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -39,7 +39,8 @@ felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
felix.auto.install.10= \
reference:file:sc-bundles/fmj.jar \
reference:file:sc-bundles/slf4j-jdk14.jar \
- reference:file:sc-bundles/jitsi-lgpl-dependencies.jar
+ reference:file:sc-bundles/jitsi-lgpl-dependencies.jar \
+ reference:file:sc-bundles/jitsi-gpl-dependencies.jar
felix.auto.start.10= \
reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index e8df121..e97d3b1 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -51,7 +51,8 @@ org.osgi.framework.system.packages.extra= \
felix.auto.install.10= \
reference:file:sc-bundles/fmj.jar \
reference:file:sc-bundles/slf4j-jdk14.jar \
- reference:file:sc-bundles/jitsi-lgpl-dependencies.jar
+ reference:file:sc-bundles/jitsi-lgpl-dependencies.jar \
+ reference:file:sc-bundles/jitsi-gpl-dependencies.jar
felix.auto.start.10= \
reference:file:lib/bundle/junit.jar \
diff --git a/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..39091c8
--- /dev/null
+++ b/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.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 36202ae..07d4ec4 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