Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 12 insertions, 18 deletions

diff --git a/.classpath b/.classpath
index 8a39b4d..e368438 100755
--- a/.classpath
+++ b/.classpath
@@ -13,8 +13,7 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar"/>
 	<classpathentry kind="lib" path="lib/bundle/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/dhcp4java-1.00.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/dict4j.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/dnsjava.jar">
+	<classpathentry kind="lib" path="lib/installer-exclude/dnsjava-2.1.7.jar" sourcepath="/dnsjava">
 		<attributes>
 			<attribute name="javadoc_location" value="http://www.dnsjava.org/dnsjava-current/doc/"/>
 		</attributes>
@@ -31,16 +30,16 @@
 	<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"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar" sourcepath="../ice4j/src"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar">
+	<classpathentry kind="lib" path="lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar" sourcepath="/ice4j/src/main/java"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/sdp-api-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/sip-api-1.2-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar" sourcepath="/jain-sip/src">
 		<attributes>
 			<attribute name="javadoc_location" value="https://hudson.jboss.org/jenkins/job/jain-sip/lastStableBuild/artifact/javadoc/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-api.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/java-sdp-nist-bridge-1.2.jar" sourcepath="/java-sdp-nist-bridge/src/main/java"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jdic_misc.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/jfontchooser-1.0.5.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jmdns.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jmyspell-core.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jna.jar"/>
@@ -48,8 +47,6 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/joscar-client.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/joscar-common.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/joscar-protocol.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/jsch-0.1.36.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/jsocks-klea.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/json-simple-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/junit.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/laf-widget.jar"/>
@@ -58,28 +55,24 @@
 			<attribute name="javadoc_location" value="http://dbus.freedesktop.org/doc/dbus-java/api/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar" sourcepath="/libjitsi/src"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/libjitsi-1.0-20170207.194207-242.jar" sourcepath="/libjitsi/src"/>
 	<classpathentry kind="lib" path="lib/bundle/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/otr4j.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/profiler4j-1.0-beta3-SC.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/libphonenumber-5.9.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/sdes4j-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/smack.jar" sourcepath="lib/installer-exclude/smack-src.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/swing-worker-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jna-platform.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/unix-0.5.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
-	<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/zrtp4j-light.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/bccontrib-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.4.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/hsqldb.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/irc-api-1.0.jar" sourcepath="lib/installer-exclude/irc-api-1.0-sources.jar"/>
@@ -88,5 +81,6 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/google-http-client-jackson2-1.20.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/google-oauth-client-1.20.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jackson-core-2.5.3.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/dnssecjava-1.1.jar" sourcepath="/dnssecjava"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>