diff --git a/.classpath b/.classpath index e6ba6ace3..06b95c255 100644 --- a/.classpath +++ b/.classpath @@ -37,9 +37,9 @@ - - - + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index b8d5c6ce8..20b9bc2a5 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -58,9 +58,9 @@ $JAVAROOT/lib/guava-r05.jar $JAVAROOT/lib/htmllexer.jar $JAVAROOT/lib/htmlparser.jar - $JAVAROOT/lib/httpclient-4.2.jar - $JAVAROOT/lib/httpcore-4.2.jar - $JAVAROOT/lib/httpmime-4.2.jar + $JAVAROOT/lib/httpclient-4.2.1.jar + $JAVAROOT/lib/httpcore-4.2.1.jar + $JAVAROOT/lib/httpmime-4.2.1.jar $JAVAROOT/lib/icu4j-core.jar $JAVAROOT/lib/iri-0.8.jar $JAVAROOT/lib/jakarta-oro-2.0.8.jar diff --git a/build.xml b/build.xml index 12bdba82e..6e38aad9a 100644 --- a/build.xml +++ b/build.xml @@ -177,9 +177,9 @@ - - - + + + diff --git a/lib/dependencies.txt b/lib/dependencies.txt index b74ad1fc8..3bdb027c4 100644 --- a/lib/dependencies.txt +++ b/lib/dependencies.txt @@ -18,13 +18,12 @@ wstx-asl-3.2.7.jar commons-codec-1.6.jar commons-fileupload-1.2.1.jar commons-httpclient-3.1.jar -commons-httpclient-3.1.jar commons-io-2.1.jar commons-lang-2.6.jar geronimo-stax-api_1.0_spec-1.0.1.jar guava-r05.jar -httpclient-4.2.jar -httpcore-4.2.jar +httpclient-4.2.1.jar +httpcore-4.2.1.jar jcl-over-slf4j-1.6.1.jar log4j-over-slf4j-1.6.1.jar lucene-analyzers-3.6.0.jar diff --git a/lib/httpclient-4.2.License b/lib/httpclient-4.2.1.License similarity index 100% rename from lib/httpclient-4.2.License rename to lib/httpclient-4.2.1.License diff --git a/lib/httpclient-4.2.jar b/lib/httpclient-4.2.1.jar similarity index 81% rename from lib/httpclient-4.2.jar rename to lib/httpclient-4.2.1.jar index 9e0df5098..1d5233328 100644 Binary files a/lib/httpclient-4.2.jar and b/lib/httpclient-4.2.1.jar differ diff --git a/lib/httpcore-4.2.License b/lib/httpcore-4.2.1.License similarity index 100% rename from lib/httpcore-4.2.License rename to lib/httpcore-4.2.1.License diff --git a/lib/httpcore-4.2.jar b/lib/httpcore-4.2.1.jar similarity index 79% rename from lib/httpcore-4.2.jar rename to lib/httpcore-4.2.1.jar index 20214eabd..16d75e1e8 100644 Binary files a/lib/httpcore-4.2.jar and b/lib/httpcore-4.2.1.jar differ diff --git a/lib/httpmime-4.2.License b/lib/httpmime-4.2.1.License similarity index 100% rename from lib/httpmime-4.2.License rename to lib/httpmime-4.2.1.License diff --git a/lib/httpmime-4.2.jar b/lib/httpmime-4.2.1.jar similarity index 79% rename from lib/httpmime-4.2.jar rename to lib/httpmime-4.2.1.jar index 8cec2fc23..f23d5be1a 100644 Binary files a/lib/httpmime-4.2.jar and b/lib/httpmime-4.2.1.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 9ea9f3bb2..9e04093f0 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -77,7 +77,7 @@ source htroot - lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/apache-solr-core-3.6.0.jar;lib/apache-solr-solrj-3.6.0.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.6.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-httpclient-3.1.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.1.jar;lib/fontbox-1.7.0.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-r05.jar;lib/htmllexer.jar;lib/htmlparser.jar;lib/httpclient-4.2.jar;lib/httpcore-4.2.jar;lib/httpmime-4.2.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.6.1.jar;lib/jempbox-1.7.0.jar;lib/jena-2.6.4.jar;lib/jetty-6.1.26-patched-JETTY-1340.jar;lib/jetty-util-6.1.26-patched-JETTY-1340.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/log4j-1.2.16.jar;lib/log4j-over-slf4j-1.6.1.jar;lib/lucene-analyzers-3.6.0.jar;lib/lucene-core-3.6.0.jar;lib/lucene-highlighter-3.6.0.jar;lib/lucene-phonetic-3.6.0.jar;lib/lucene-spatial-3.6.0.jar;lib/lucene-spellchecker-3.6.0.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.0.jar;lib/poi-3.6-20091214.jar;lib/poi-scratchpad-3.6-20091214.jar;lib/sax-2.0.1.jar;lib/servlet-api-2.5-20081211.jar;lib/slf4j-api-1.6.1.jar;lib/slf4j-jdk14-1.6.1.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar + lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/apache-solr-core-3.6.0.jar;lib/apache-solr-solrj-3.6.0.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.6.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-httpclient-3.1.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.1.jar;lib/fontbox-1.7.0.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-r05.jar;lib/htmllexer.jar;lib/htmlparser.jar;lib/httpclient-4.2.1.jar;lib/httpcore-4.2.1.jar;lib/httpmime-4.2.1.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.6.1.jar;lib/jempbox-1.7.0.jar;lib/jena-2.6.4.jar;lib/jetty-6.1.26-patched-JETTY-1340.jar;lib/jetty-util-6.1.26-patched-JETTY-1340.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/log4j-1.2.16.jar;lib/log4j-over-slf4j-1.6.1.jar;lib/lucene-analyzers-3.6.0.jar;lib/lucene-core-3.6.0.jar;lib/lucene-highlighter-3.6.0.jar;lib/lucene-phonetic-3.6.0.jar;lib/lucene-spatial-3.6.0.jar;lib/lucene-spellchecker-3.6.0.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.0.jar;lib/poi-3.6-20091214.jar;lib/poi-scratchpad-3.6-20091214.jar;lib/sax-2.0.1.jar;lib/servlet-api-2.5-20081211.jar;lib/slf4j-api-1.6.1.jar;lib/slf4j-jdk14-1.6.1.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar 1.6