diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2016-04-11 23:36:22 +0200 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2016-04-12 23:36:44 +0200 |
| commit | cd62892c2706370b23d334ee28e07b2090269090 (patch) | |
| tree | 90f81b44348f53aa431342c474003c7069776534 /lib | |
| parent | 3c2285cccee21c9bb4d5618279e0093097295b5b (diff) | |
| download | jitsi-cd62892c2706370b23d334ee28e07b2090269090.zip jitsi-cd62892c2706370b23d334ee28e07b2090269090.tar.gz jitsi-cd62892c2706370b23d334ee28e07b2090269090.tar.bz2 | |
Update ice4j and jain-sip dependencies
* ice4j: v1.0
* jain-sip-api: move to FLOSS version from Opentelecoms (v1.2)
* jain-sdp-api: move to FLOSS version from Opentelecoms (v1.0)
* jain-sip-ri:
jitsi branch with oss-only components, based on 1.2.279
(tag v1.2.279-jitsi-oss1)
* sdp-nist-bridge: v1.1
These libraries are used as released on Maven Central.
* Update OSGi manifests
Now that jain-sip and ice4j are no longer directly bundled,
import the required packages.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/felix.client.run.properties | 12 | ||||
| -rw-r--r-- | lib/felix.unit.test.properties | 15 | ||||
| -rw-r--r-- | lib/installer-exclude/ice4j-1.0.jar | bin | 0 -> 471913 bytes | |||
| -rw-r--r-- | lib/installer-exclude/ice4j.jar | bin | 427749 -> 0 bytes | |||
| -rw-r--r-- | lib/installer-exclude/jain-sdp.jar | bin | 151866 -> 0 bytes | |||
| -rw-r--r-- | lib/installer-exclude/jain-sip-api.jar | bin | 53813 -> 0 bytes | |||
| -rw-r--r-- | lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar | bin | 0 -> 1029073 bytes | |||
| -rw-r--r-- | lib/installer-exclude/jain-sip-ri.jar | bin | 750829 -> 0 bytes | |||
| -rw-r--r-- | lib/installer-exclude/java-sdp-nist-bridge-1.1.jar | bin | 0 -> 8266 bytes | |||
| -rw-r--r-- | lib/installer-exclude/sdp-api-1.0.jar | bin | 0 -> 16131 bytes | |||
| -rw-r--r-- | lib/installer-exclude/sip-api-1.2-1.2.jar | bin | 0 -> 58898 bytes |
11 files changed, 24 insertions, 3 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index 82ff800..15e34f2 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -25,7 +25,9 @@ org.osgi.framework.system.packages.extra= \ sun.net.dns; \ sun.security.action; \ sun.security.pkcs11;\ - sun.audio + sun.audio;\ + sun.nio.ch;\ + com.sun.nio.sctp felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar @@ -45,6 +47,14 @@ felix.auto.start.10= \ reference:file:sc-bundles/slf4j-api.jar \ reference:file:sc-bundles/weupnp.jar +felix.auto.start.11= \ + reference:file:sc-bundles/sip-api.jar \ + reference:file:sc-bundles/sdp-api.jar \ + reference:file:sc-bundles/jain-sip-ri.jar \ + reference:file:sc-bundles/java-sdp-nist-bridge.jar \ + reference:file:sc-bundles/ice4j.jar + + # file:lib/bundle/shell.jar \ # file:lib/bundle/servicebinder.jar \ # file:lib/bundle/tablelayout.jar diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index 415af6d..044f24e 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -32,7 +32,9 @@ org.osgi.framework.system.packages.extra= \ sun.security.pkcs11; \ sun.reflect; \ org.xbill.DNS;\ - sun.audio + sun.audio;\ + sun.nio.ch;\ + com.sun.nio.sctp # @@ -58,7 +60,16 @@ felix.auto.start.10= \ reference:file:sc-bundles/bccontrib.jar \ reference:file:sc-bundles/hsqldb.jar \ reference:file:sc-bundles/commons-lang.jar \ - reference:file:sc-bundles/guava.jar + reference:file:sc-bundles/guava.jar \ + reference:file:sc-bundles/weupnp.jar + +felix.auto.start.11= \ + reference:file:sc-bundles/sip-api.jar \ + reference:file:sc-bundles/sdp-api.jar \ + reference:file:sc-bundles/jain-sip-ri.jar \ + reference:file:sc-bundles/java-sdp-nist-bridge.jar \ + reference:file:sc-bundles/ice4j.jar + # file:lib/bundle/shell.jar \ # file:lib/bundle/bundlerepository.jar \ # file:lib/bundle/servicebinder.jar \ diff --git a/lib/installer-exclude/ice4j-1.0.jar b/lib/installer-exclude/ice4j-1.0.jar Binary files differnew file mode 100644 index 0000000..f899c28 --- /dev/null +++ b/lib/installer-exclude/ice4j-1.0.jar diff --git a/lib/installer-exclude/ice4j.jar b/lib/installer-exclude/ice4j.jar Binary files differdeleted file mode 100644 index 0bdde1c..0000000 --- a/lib/installer-exclude/ice4j.jar +++ /dev/null diff --git a/lib/installer-exclude/jain-sdp.jar b/lib/installer-exclude/jain-sdp.jar Binary files differdeleted file mode 100644 index 8f4b7a6..0000000 --- a/lib/installer-exclude/jain-sdp.jar +++ /dev/null diff --git a/lib/installer-exclude/jain-sip-api.jar b/lib/installer-exclude/jain-sip-api.jar Binary files differdeleted file mode 100644 index 3ed1a74..0000000 --- a/lib/installer-exclude/jain-sip-api.jar +++ /dev/null diff --git a/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar b/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar Binary files differnew file mode 100644 index 0000000..f19d986 --- /dev/null +++ b/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar diff --git a/lib/installer-exclude/jain-sip-ri.jar b/lib/installer-exclude/jain-sip-ri.jar Binary files differdeleted file mode 100644 index e5298b6..0000000 --- a/lib/installer-exclude/jain-sip-ri.jar +++ /dev/null diff --git a/lib/installer-exclude/java-sdp-nist-bridge-1.1.jar b/lib/installer-exclude/java-sdp-nist-bridge-1.1.jar Binary files differnew file mode 100644 index 0000000..77b8b59 --- /dev/null +++ b/lib/installer-exclude/java-sdp-nist-bridge-1.1.jar diff --git a/lib/installer-exclude/sdp-api-1.0.jar b/lib/installer-exclude/sdp-api-1.0.jar Binary files differnew file mode 100644 index 0000000..fc50919 --- /dev/null +++ b/lib/installer-exclude/sdp-api-1.0.jar diff --git a/lib/installer-exclude/sip-api-1.2-1.2.jar b/lib/installer-exclude/sip-api-1.2-1.2.jar Binary files differnew file mode 100644 index 0000000..3adf4c3 --- /dev/null +++ b/lib/installer-exclude/sip-api-1.2-1.2.jar |