diff --git a/.classpath b/.classpath index 27ca015d7..adff24117 100644 --- a/.classpath +++ b/.classpath @@ -33,19 +33,14 @@ - - - - - @@ -65,6 +60,11 @@ + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 1b6c20782..94b54e344 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -45,7 +45,7 @@ $JAVAROOT/lib/arq-2.8.7.jar $JAVAROOT/lib/bcmail-jdk15-145.jar $JAVAROOT/lib/bcprov-jdk15-145.jar - $JAVAROOT/lib/commons-codec-1.6.jar + $JAVAROOT/lib/commons-codec-1.7.jar $JAVAROOT/lib/commons-compress-1.4.1.jar $JAVAROOT/lib/commons-fileupload-1.2.2.jar $JAVAROOT/lib/commons-httpclient-3.1.jar @@ -64,7 +64,7 @@ $JAVAROOT/lib/iri-0.8.jar $JAVAROOT/lib/jakarta-oro-2.0.8.jar $JAVAROOT/lib/jcifs-1.3.15.jar - $JAVAROOT/lib/jcl-over-slf4j-1.6.1.jar + $JAVAROOT/lib/jcl-over-slf4j-1.6.4.jar $JAVAROOT/lib/jempbox-1.7.0.jar $JAVAROOT/lib/jena-2.6.4.jar $JAVAROOT/lib/jetty-6.1.26-patched-JETTY-1340.jar @@ -72,7 +72,7 @@ $JAVAROOT/lib/jsch-0.1.42.jar $JAVAROOT/lib/json-simple-1.1.jar $JAVAROOT/lib/log4j-1.2.16.jar - $JAVAROOT/lib/log4j-over-slf4j-1.6.1.jar + $JAVAROOT/lib/log4j-over-slf4j-1.6.4.jar $JAVAROOT/lib/lucene-analyzers-3.6.1.jar $JAVAROOT/lib/lucene-grouping-3.6.1.jar $JAVAROOT/lib/lucene-core-3.6.1.jar @@ -88,8 +88,8 @@ $JAVAROOT/lib/poi-scratchpad-3.6-20091214.jar $JAVAROOT/lib/sax-2.0.1.jar $JAVAROOT/lib/servlet-api-2.5-20081211.jar - $JAVAROOT/lib/slf4j-api-1.6.1.jar - $JAVAROOT/lib/slf4j-jdk14-1.6.1.jar + $JAVAROOT/lib/slf4j-api-1.6.4.jar + $JAVAROOT/lib/slf4j-jdk14-1.6.4.jar $JAVAROOT/lib/webcat-0.1-swf.jar $JAVAROOT/lib/wstx-asl-3.2.7.jar $JAVAROOT/lib/xercesImpl.jar diff --git a/build.xml b/build.xml index 55cf12de4..f822ca1dc 100644 --- a/build.xml +++ b/build.xml @@ -164,7 +164,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -208,8 +208,8 @@ - - + + diff --git a/lib/commons-codec-1.6.jar b/lib/commons-codec-1.6.jar deleted file mode 100644 index ee1bc49ac..000000000 Binary files a/lib/commons-codec-1.6.jar and /dev/null differ diff --git a/lib/commons-codec-1.6.License b/lib/commons-codec-1.7.License similarity index 100% rename from lib/commons-codec-1.6.License rename to lib/commons-codec-1.7.License diff --git a/lib/commons-codec-1.7.jar b/lib/commons-codec-1.7.jar new file mode 100644 index 000000000..efa7f7291 Binary files /dev/null and b/lib/commons-codec-1.7.jar differ diff --git a/lib/jcl-over-slf4j-1.6.1.jar b/lib/jcl-over-slf4j-1.6.4.jar similarity index 76% rename from lib/jcl-over-slf4j-1.6.1.jar rename to lib/jcl-over-slf4j-1.6.4.jar index 79e1ec2ca..3d0bb1f3a 100644 Binary files a/lib/jcl-over-slf4j-1.6.1.jar and b/lib/jcl-over-slf4j-1.6.4.jar differ diff --git a/lib/log4j-over-slf4j-1.6.1.jar b/lib/log4j-over-slf4j-1.6.1.jar deleted file mode 100644 index c4025f42e..000000000 Binary files a/lib/log4j-over-slf4j-1.6.1.jar and /dev/null differ diff --git a/lib/log4j-over-slf4j-1.6.4.jar b/lib/log4j-over-slf4j-1.6.4.jar new file mode 100644 index 000000000..ac397ff74 Binary files /dev/null and b/lib/log4j-over-slf4j-1.6.4.jar differ diff --git a/lib/slf4j-api-1.6.1.jar b/lib/slf4j-api-1.6.1.jar deleted file mode 100644 index 42e0ad0de..000000000 Binary files a/lib/slf4j-api-1.6.1.jar and /dev/null differ diff --git a/lib/slf4j-api-1.6.4.jar b/lib/slf4j-api-1.6.4.jar new file mode 100644 index 000000000..76ef3050f Binary files /dev/null and b/lib/slf4j-api-1.6.4.jar differ diff --git a/lib/slf4j-jdk14-1.6.1.jar b/lib/slf4j-jdk14-1.6.1.jar deleted file mode 100644 index f4eb2f8af..000000000 Binary files a/lib/slf4j-jdk14-1.6.1.jar and /dev/null differ diff --git a/lib/slf4j-jdk14-1.6.4.jar b/lib/slf4j-jdk14-1.6.4.jar new file mode 100644 index 000000000..178483144 Binary files /dev/null and b/lib/slf4j-jdk14-1.6.4.jar differ