update to SLF4J 1.7.9

12 files changed, 17 insertions, 17 deletions

diff --git a/.classpath b/.classpath
index df52bb54c..1992dccdb 100644
--- a/.classpath
+++ b/.classpath
@@ -28,10 +28,10 @@
 	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>

 	<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>

 	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>

-	<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/>

+	<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.9.jar"/>

 	<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>

-	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>

-	<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>

+	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.9.jar"/>

+	<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.9.jar"/>

 	<classpathentry kind="lib" path="lib/httpclient-4.3.6.jar"/>

 	<classpathentry kind="lib" path="lib/httpcore-4.3.3.jar"/>

 	<classpathentry kind="lib" path="lib/httpmime-4.3.6.jar"/>

@@ -51,7 +51,7 @@
 	<classpathentry kind="lib" path="lib/poi-3.10.1.jar"/>

 	<classpathentry kind="lib" path="lib/poi-scratchpad-3.10.1.jar"/>

 	<classpathentry kind="lib" path="lib/commons-io-2.3.jar"/>

-	<classpathentry kind="lib" path="lib/slf4j-api-1.7.6.jar"/>

+	<classpathentry kind="lib" path="lib/slf4j-api-1.7.9.jar"/>

 	<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.10.2.jar"/>

 	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.10.2.jar"/>

 	<classpathentry kind="lib" path="lib/lucene-classification-4.10.2.jar"/>

diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index 5170cec1d..984a205fc 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -60,7 +60,7 @@
 			<string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string>
 			<string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar</string>
 			<string>$JAVAROOT/lib/jcifs-1.3.17.jar</string>
-			<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string>
+			<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.9.jar</string>
 			<string>$JAVAROOT/lib/jempbox-1.8.8.jar</string>
 			<string>$JAVAROOT/lib/javax.servlet-api-3.1.0.jar</string>
 			<string>$JAVAROOT/lib/jetty-client-9.2.6.v20141205.jar</string>
@@ -80,7 +80,7 @@
 			<string>$JAVAROOT/lib/jsch-0.1.51.jar</string>
 			<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
 			<string>$JAVAROOT/lib/jsoup-1.8.1.jar</string>
-			<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
+			<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.9.jar</string>
 			<string>$JAVAROOT/lib/lucene-analyzers-common-4.10.2.jar</string>
 			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.10.2.jar</string>
 			<string>$JAVAROOT/lib/lucene-classification-4.10.2.jar</string>
@@ -102,8 +102,8 @@
 			<string>$JAVAROOT/lib/pdfbox-1.8.8.jar</string>
 			<string>$JAVAROOT/lib/poi-3.10.1.jar</string>
 			<string>$JAVAROOT/lib/poi-scratchpad-3.10.1.jar</string>
-			<string>$JAVAROOT/lib/slf4j-api-1.7.6.jar</string>
-			<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
+			<string>$JAVAROOT/lib/slf4j-api-1.7.9.jar</string>
+			<string>$JAVAROOT/lib/slf4j-jdk14-1.7.9.jar</string>
 			<string>$JAVAROOT/lib/solr-core-4.10.2.jar</string>
 			<string>$JAVAROOT/lib/solr-solrj-4.10.2.jar</string>
 			<string>$JAVAROOT/lib/spatial4j-0.4.1.jar</string>
diff --git a/build.xml b/build.xml
index 592cd2c3b..305bde3d8 100644
--- a/build.xml
+++ b/build.xml
@@ -184,7 +184,7 @@
         <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
     	<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
     	<pathelement location="${lib}/jcifs-1.3.17.jar" />
-    	<pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" />
+    	<pathelement location="${lib}/jcl-over-slf4j-1.7.9.jar" />
     	<pathelement location="${lib}/jempbox-1.8.8" />
         <pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
         <pathelement location="${lib}/jetty-client-9.2.6.v20141205.jar" />
@@ -204,7 +204,7 @@
     	<pathelement location="${lib}/jsch-0.1.51.jar" />
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.8.1.jar" />
-    	<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
+    	<pathelement location="${lib}/log4j-over-slf4j-1.7.9.jar" />
     	<pathelement location="${lib}/lucene-analyzers-common-4.10.2.jar" />
     	<pathelement location="${lib}/lucene-analyzers-phonetic-4.10.2.jar" />
     	<pathelement location="${lib}/lucene-classification-4.10.2.jar" />
@@ -226,8 +226,8 @@
         <pathelement location="${lib}/pdfbox-1.8.8.jar" />
     	<pathelement location="${lib}/poi-3.10.1.jar" />
     	<pathelement location="${lib}/poi-scratchpad-3.10.1.jar" />
-        <pathelement location="${lib}/slf4j-api-1.7.6.jar" />
-        <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
+        <pathelement location="${lib}/slf4j-api-1.7.9.jar" />
+        <pathelement location="${lib}/slf4j-jdk14-1.7.9.jar" />
         <pathelement location="${lib}/solr-core-4.10.2.jar" />
         <pathelement location="${lib}/solr-solrj-4.10.2.jar" />
     	<pathelement location="${lib}/spatial4j-0.4.1.jar" />
diff --git a/lib/jcl-over-slf4j-1.7.2.jar b/lib/jcl-over-slf4j-1.7.2.jar
deleted file mode 100644
index 63888dc94..000000000
--- a/lib/jcl-over-slf4j-1.7.2.jar
+++ /dev/null
diff --git a/lib/jcl-over-slf4j-1.7.9.jar b/lib/jcl-over-slf4j-1.7.9.jar
new file mode 100644
index 000000000..682a46b1f
--- /dev/null
+++ b/lib/jcl-over-slf4j-1.7.9.jar
diff --git a/lib/log4j-over-slf4j-1.7.2.jar b/lib/log4j-over-slf4j-1.7.2.jar
deleted file mode 100644
index cd04c46a1..000000000
--- a/lib/log4j-over-slf4j-1.7.2.jar
+++ /dev/null
diff --git a/lib/log4j-over-slf4j-1.7.9.jar b/lib/log4j-over-slf4j-1.7.9.jar
new file mode 100644
index 000000000..c8289369d
--- /dev/null
+++ b/lib/log4j-over-slf4j-1.7.9.jar
diff --git a/lib/slf4j-api-1.7.6.jar b/lib/slf4j-api-1.7.6.jar
deleted file mode 100644
index 19aaf3766..000000000
--- a/lib/slf4j-api-1.7.6.jar
+++ /dev/null
diff --git a/lib/slf4j-api-1.7.9.jar b/lib/slf4j-api-1.7.9.jar
new file mode 100644
index 000000000..3d7274426
--- /dev/null
+++ b/lib/slf4j-api-1.7.9.jar
diff --git a/lib/slf4j-jdk14-1.7.2.jar b/lib/slf4j-jdk14-1.7.9.jar
index 194d2f0c2..750272056 100644
--- a/lib/slf4j-jdk14-1.7.2.jar
+++ b/lib/slf4j-jdk14-1.7.9.jar
diff --git a/nbproject/project.xml b/nbproject/project.xml
index b36303c64..a35d18bcc 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -83,7 +83,7 @@
             <compilation-unit>

                 <package-root>source</package-root>

                 <package-root>htroot</package-root>

-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>

+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>

                 <built-to>lib/yacycore.jar</built-to>

                 <source-level>1.7</source-level>

             </compilation-unit>

diff --git a/pom.xml b/pom.xml
index 1756ef76a..a9db531aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
@@ -434,7 +434,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
@@ -519,12 +519,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.9</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>