diff --git a/.classpath b/.classpath index 3ecb8ed74..f03a811ba 100644 --- a/.classpath +++ b/.classpath @@ -24,12 +24,10 @@ - - @@ -47,7 +45,9 @@ - + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 40eabce38..d1e22e981 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -39,11 +39,11 @@ $JAVAROOT/htroot $JAVAROOT/lib/activation.jar $JAVAROOT/lib/apache-mime4j-0.6.jar - $JAVAROOT/lib/apache-solr-solrj-3.4.0.jar + $JAVAROOT/lib/apache-solr-solrj-3.5.0.jar $JAVAROOT/lib/bcmail-jdk15-145.jar $JAVAROOT/lib/bcprov-jdk15-145.jar $JAVAROOT/lib/bzip2.jar - $JAVAROOT/lib/commons-codec-1.4.jar + $JAVAROOT/lib/commons-codec-1.6.jar $JAVAROOT/lib/commons-fileupload-1.2.2.jar $JAVAROOT/lib/commons-httpclient-3.1.jar $JAVAROOT/lib/commons-io-2.0.1.jar @@ -52,7 +52,7 @@ $JAVAROOT/lib/fontbox-1.6.0.jar $JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar $JAVAROOT/lib/httpclient-4.1.2.jar - $JAVAROOT/lib/httpcore-4.1.3.jar + $JAVAROOT/lib/httpcore-4.1.4.jar $JAVAROOT/lib/httpmime-4.1.2.jar $JAVAROOT/lib/icu4j-core.jar $JAVAROOT/lib/J7Zip-modified.jar diff --git a/build.xml b/build.xml index e05e27721..388838334 100644 --- a/build.xml +++ b/build.xml @@ -157,11 +157,11 @@ - + - + @@ -170,7 +170,7 @@ - + diff --git a/lib/apache-solr-solrj-3.4.0.License b/lib/apache-solr-solrj-3.5.0.License similarity index 100% rename from lib/apache-solr-solrj-3.4.0.License rename to lib/apache-solr-solrj-3.5.0.License diff --git a/lib/apache-solr-solrj-3.4.0.jar b/lib/apache-solr-solrj-3.5.0.jar similarity index 77% rename from lib/apache-solr-solrj-3.4.0.jar rename to lib/apache-solr-solrj-3.5.0.jar index f615d9437..cc681bc45 100644 Binary files a/lib/apache-solr-solrj-3.4.0.jar and b/lib/apache-solr-solrj-3.5.0.jar differ diff --git a/lib/commons-codec-1.4.jar b/lib/commons-codec-1.4.jar deleted file mode 100644 index 458d432da..000000000 Binary files a/lib/commons-codec-1.4.jar and /dev/null differ diff --git a/lib/commons-codec-1.4.License b/lib/commons-codec-1.6.License similarity index 100% rename from lib/commons-codec-1.4.License rename to lib/commons-codec-1.6.License diff --git a/lib/commons-codec-1.6.jar b/lib/commons-codec-1.6.jar new file mode 100644 index 000000000..ee1bc49ac Binary files /dev/null and b/lib/commons-codec-1.6.jar differ diff --git a/lib/httpcore-4.1.3.License b/lib/httpcore-4.1.4.License similarity index 100% rename from lib/httpcore-4.1.3.License rename to lib/httpcore-4.1.4.License diff --git a/lib/httpcore-4.1.3.jar b/lib/httpcore-4.1.4.jar similarity index 76% rename from lib/httpcore-4.1.3.jar rename to lib/httpcore-4.1.4.jar index af56c7a06..88202d2bf 100644 Binary files a/lib/httpcore-4.1.3.jar and b/lib/httpcore-4.1.4.jar differ