Merge commit 'cf5da99'HEADmaster

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

44 files changed, 0 insertions, 89 deletions

diff --git a/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar b/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar
deleted file mode 100644
index 719078e..0000000
--- a/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/lib/installer-exclude/bccontrib-1.0.jar b/lib/installer-exclude/bccontrib-1.0.jar
new file mode 100644
index 0000000..47a6a89
--- /dev/null
+++ b/lib/installer-exclude/bccontrib-1.0.jar
diff --git a/lib/installer-exclude/bcpkix-jdk15on-1.54.jar b/lib/installer-exclude/bcpkix-jdk15on-1.54.jar
new file mode 100644
index 0000000..86f7f0b
--- /dev/null
+++ b/lib/installer-exclude/bcpkix-jdk15on-1.54.jar
diff --git a/lib/installer-exclude/bcpkix-jdk15on-151.jar b/lib/installer-exclude/bcpkix-jdk15on-151.jar
deleted file mode 100755
index 57e0080..0000000
--- a/lib/installer-exclude/bcpkix-jdk15on-151.jar
+++ /dev/null
diff --git a/lib/installer-exclude/bcprov-jdk15on-1.54.jar b/lib/installer-exclude/bcprov-jdk15on-1.54.jar
new file mode 100644
index 0000000..bd95185
--- /dev/null
+++ b/lib/installer-exclude/bcprov-jdk15on-1.54.jar
diff --git a/lib/installer-exclude/bcprov-jdk15on-151.jar b/lib/installer-exclude/bcprov-jdk15on-151.jar
deleted file mode 100755
index 4076e11..0000000
--- a/lib/installer-exclude/bcprov-jdk15on-151.jar
+++ /dev/null
diff --git a/lib/installer-exclude/dict4j.jar b/lib/installer-exclude/dict4j.jar
deleted file mode 100755
index 7eb9813..0000000
--- a/lib/installer-exclude/dict4j.jar
+++ /dev/null
diff --git a/lib/installer-exclude/dnsjava.jar b/lib/installer-exclude/dnsjava-2.1.7.jar
index 8158168..6e85e30 100644
--- a/lib/installer-exclude/dnsjava.jar
+++ b/lib/installer-exclude/dnsjava-2.1.7.jar
diff --git a/lib/installer-exclude/dnssecjava-1.1.jar b/lib/installer-exclude/dnssecjava-1.1.jar
new file mode 100644
index 0000000..57ad85a
--- /dev/null
+++ b/lib/installer-exclude/dnssecjava-1.1.jar
diff --git a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
index a9757b3..9e56a31 100644
--- a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
diff --git a/lib/installer-exclude/httpclient.manifest.mf b/lib/installer-exclude/httpclient.manifest.mf
deleted file mode 100644
index bbd83f0..0000000
--- a/lib/installer-exclude/httpclient.manifest.mf
+++ /dev/null
@@ -1,41 +0,0 @@
-Bundle-Name: Apache Http Client
-Bundle-Description: Apache Http Client
-Bundle-Vendor: jitsi.org
-Bundle-Version: 4.2.3
-Bundle-SymbolicName: org.apache.http
-Import-Package: org.apache.commons.logging,
- javax.security.auth.x500,
- javax.net.ssl
-Export-Package: org.apache.http,
- org.apache.http.entity,
- org.apache.http.entity.mime,
- org.apache.http.entity.mime.content,
- org.apache.http.impl,
- org.apache.http.impl.auth,
- org.apache.http.impl.client,
- org.apache.http.impl.conn,
- org.apache.http.impl.entity,
- org.apache.http.impl.io,
- org.apache.http.io,
- org.apache.http.message,
- org.apache.http.params,
- org.apache.http.protocol,
- org.apache.http.util,
- org.apache.http.annotation,
- org.apache.http.auth,
- org.apache.http.auth.params,
- org.apache.http.client,
- org.apache.http.client.entity,
- org.apache.http.client.methods,
- org.apache.http.client.params,
- org.apache.http.client.protocol,
- org.apache.http.client.utils,
- org.apache.http.conn,
- org.apache.http.conn.params,
- org.apache.http.conn.routing,
- org.apache.http.conn.scheme,
- org.apache.http.conn.ssl,
- org.apache.http.conn.util,
- org.apache.http.impl.client
-
-
diff --git a/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar b/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar
new file mode 100644
index 0000000..752334b
--- /dev/null
+++ b/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar
diff --git a/lib/installer-exclude/ice4j.jar b/lib/installer-exclude/ice4j.jar
deleted 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
deleted 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
deleted 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
new 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
deleted 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.2.jar b/lib/installer-exclude/java-sdp-nist-bridge-1.2.jar
new file mode 100644
index 0000000..2efa7fc
--- /dev/null
+++ b/lib/installer-exclude/java-sdp-nist-bridge-1.2.jar
diff --git a/lib/installer-exclude/jcommon-1.0.0.jar b/lib/installer-exclude/jcommon-1.0.0.jar
deleted file mode 100644
index c5d23f4..0000000
--- a/lib/installer-exclude/jcommon-1.0.0.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jdom.jar b/lib/installer-exclude/jdom.jar
deleted file mode 100644
index 288e64c..0000000
--- a/lib/installer-exclude/jdom.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jfontchooser-1.0.5.jar b/lib/installer-exclude/jfontchooser-1.0.5.jar
deleted file mode 100644
index 769c8f1..0000000
--- a/lib/installer-exclude/jfontchooser-1.0.5.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jfontchooser.manifest.mf b/lib/installer-exclude/jfontchooser.manifest.mf
deleted file mode 100644
index 6ad2b73..0000000
--- a/lib/installer-exclude/jfontchooser.manifest.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle-Name: JFontChooser
-Bundle-Description: A library containing a Java Font Chooser
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Bundle-SymbolicName: say.swing
-Import-Package: javax.swing,
- javax.swing.border,
- javax.swing.event,
- javax.swing.text
-Export-Package: say.swing
diff --git a/lib/installer-exclude/jfreechart-1.0.1.jar b/lib/installer-exclude/jfreechart-1.0.1.jar
deleted file mode 100644
index 3e4f9cd..0000000
--- a/lib/installer-exclude/jfreechart-1.0.1.jar
+++ /dev/null
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
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 ec93db9..07d4ec4 100644
--- a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
diff --git a/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar b/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar
deleted file mode 100644
index 671c474..0000000
--- a/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jmork-1.0.5.jar b/lib/installer-exclude/jmork-1.0.5.jar
new file mode 100644
index 0000000..f87ee11
--- /dev/null
+++ b/lib/installer-exclude/jmork-1.0.5.jar
diff --git a/lib/installer-exclude/jna.manifest.mf b/lib/installer-exclude/jna.manifest.mf
deleted file mode 100644
index 0c32920..0000000
--- a/lib/installer-exclude/jna.manifest.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-Name: JNA Lib Provider
-Bundle-Description: JNA Lib Provider
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Bundle-SymbolicName: com.sun.jna
-Export-Package: com.sun.jna.win32,
- com.sun.jna,
- com.sun.jna.ptr,
- com.sun.jna.platform,
- com.sun.jna.platform.win32
-
-
diff --git a/lib/installer-exclude/jsch-0.1.36.jar b/lib/installer-exclude/jsch-0.1.36.jar
deleted file mode 100644
index fde92b4..0000000
--- a/lib/installer-exclude/jsch-0.1.36.jar
+++ /dev/null
diff --git a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar b/lib/installer-exclude/libjitsi-1.0-20170207.194207-242.jar
index cf37b9e..a8ca832 100644
--- a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/libjitsi-1.0-20170207.194207-242.jar
diff --git a/lib/installer-exclude/p4j-exclusions.txt b/lib/installer-exclude/p4j-exclusions.txt
deleted file mode 100644
index 7b76523..0000000
--- a/lib/installer-exclude/p4j-exclusions.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#

-# This file lists those classes that should be ignored by 

-# the agent during instrumentation. In most cases these 

-# classes trigger JVM internal errors and should be simply 

-# ignored. Notice that some classes are ignored even if

-# not listed here (they may cause your JVM to crash 

-# seriously so I hard-coded exclusions for those within 

-# the agent)

-#

-# The agent will ignore all classes STARTING WITH the string

-# indicated. So, you can exclude a whole package by ending 

-# with '.'

-#

-

-org.apache.tomcat.jni.OS

-org.jboss.util.xml.DOMWriter

-org.jboss.mq.il.uil2.ServerSocketManagerHandler

-org.hsqldb.jdbc.jdbcConnection

-org.hsqldb.Index

-bsh.ParserTokenManager

-org.eclipse.jdt.internal.compiler.lookup.TypeBinding

-org.eclipse.jdt.internal.compiler.ast.Expression

-org.eclipse.jdt.internal.compiler.problem.ProblemReporter

-org.eclipse.jdt.internal.compiler.impl.Constant

-com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore

-sun.reflect.
\ No newline at end of file
diff --git a/lib/installer-exclude/profiler4j-1.0-beta3-SC.jar b/lib/installer-exclude/profiler4j-1.0-beta3-SC.jar
deleted file mode 100644
index 1212cb8..0000000
--- a/lib/installer-exclude/profiler4j-1.0-beta3-SC.jar
+++ /dev/null
diff --git a/lib/installer-exclude/sdp-api-1.0.jar b/lib/installer-exclude/sdp-api-1.0.jar
new 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
new file mode 100644
index 0000000..3adf4c3
--- /dev/null
+++ b/lib/installer-exclude/sip-api-1.2-1.2.jar
diff --git a/lib/installer-exclude/smack.jar b/lib/installer-exclude/smack.jar
index b0cc856..80bd5c7 100644
--- a/lib/installer-exclude/smack.jar
+++ b/lib/installer-exclude/smack.jar
diff --git a/lib/installer-exclude/smackx-debug.jar b/lib/installer-exclude/smackx-debug.jar
index 3311681..45bcaaf 100644
--- a/lib/installer-exclude/smackx-debug.jar
+++ b/lib/installer-exclude/smackx-debug.jar
diff --git a/lib/installer-exclude/smackx.jar b/lib/installer-exclude/smackx.jar
index ba590ca..6362497 100644
--- a/lib/installer-exclude/smackx.jar
+++ b/lib/installer-exclude/smackx.jar
diff --git a/lib/installer-exclude/swing-worker-1.2.jar b/lib/installer-exclude/swing-worker-1.2.jar
deleted file mode 100644
index 6953042..0000000
--- a/lib/installer-exclude/swing-worker-1.2.jar
+++ /dev/null
diff --git a/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar b/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar
deleted file mode 100644
index 5051f8f..0000000
--- a/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar
+++ /dev/null
diff --git a/lib/installer-exclude/weupnp-0.1.4.jar b/lib/installer-exclude/weupnp-0.1.4.jar
new file mode 100644
index 0000000..a03b9e2
--- /dev/null
+++ b/lib/installer-exclude/weupnp-0.1.4.jar
diff --git a/lib/installer-exclude/xalan-2.6.0.jar.ant b/lib/installer-exclude/xalan-2.6.0.jar.ant
deleted file mode 100755
index c307040..0000000
--- a/lib/installer-exclude/xalan-2.6.0.jar.ant
+++ /dev/null
diff --git a/lib/installer-exclude/ymsg_network_v0_67.jar b/lib/installer-exclude/ymsg_network_v0_67.jar
deleted file mode 100644
index 998358a..0000000
--- a/lib/installer-exclude/ymsg_network_v0_67.jar
+++ /dev/null
diff --git a/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar b/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
new file mode 100644
index 0000000..a7819d2
--- /dev/null
+++ b/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
diff --git a/lib/installer-exclude/zrtp4j-light.jar b/lib/installer-exclude/zrtp4j-light.jar
deleted file mode 100644
index 72797c6..0000000
--- a/lib/installer-exclude/zrtp4j-light.jar
+++ /dev/null