diff --git a/.classpath b/.classpath index a113c5019..b584ca1c4 100644 --- a/.classpath +++ b/.classpath @@ -45,9 +45,9 @@ - + - + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index a8c052187..6ad102a46 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -53,9 +53,9 @@ $JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar $JAVAROOT/lib/guava-13.0.1.jar $JAVAROOT/lib/htmllexer.jar - $JAVAROOT/lib/httpclient-4.3.jar + $JAVAROOT/lib/httpclient-4.3.1.jar $JAVAROOT/lib/httpcore-4.3.jar - $JAVAROOT/lib/httpmime-4.3.jar + $JAVAROOT/lib/httpmime-4.3.1.jar $JAVAROOT/lib/icu4j-core.jar $JAVAROOT/lib/iri-0.8.jar $JAVAROOT/lib/J7Zip-modified.jar diff --git a/build.xml b/build.xml index eafad4e22..c2dd184e9 100644 --- a/build.xml +++ b/build.xml @@ -177,9 +177,9 @@ - + - + diff --git a/lib/dependencies.txt b/lib/dependencies.txt index 25ea9a53d..656e145d4 100644 --- a/lib/dependencies.txt +++ b/lib/dependencies.txt @@ -22,7 +22,7 @@ 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.3.jar +httpclient-4.3.1.jar httpcore-4.3.jar jcl-over-slf4j-1.6.1.jar log4j-over-slf4j-1.6.1.jar diff --git a/lib/httpclient-4.3.License b/lib/httpclient-4.3.1.License similarity index 100% rename from lib/httpclient-4.3.License rename to lib/httpclient-4.3.1.License diff --git a/lib/httpclient-4.3.jar b/lib/httpclient-4.3.1.jar similarity index 84% rename from lib/httpclient-4.3.jar rename to lib/httpclient-4.3.1.jar index 5c446f04d..9b47364a5 100644 Binary files a/lib/httpclient-4.3.jar and b/lib/httpclient-4.3.1.jar differ diff --git a/lib/httpmime-4.3.License b/lib/httpmime-4.3.1.License similarity index 100% rename from lib/httpmime-4.3.License rename to lib/httpmime-4.3.1.License diff --git a/lib/httpmime-4.3.jar b/lib/httpmime-4.3.1.jar similarity index 80% rename from lib/httpmime-4.3.jar rename to lib/httpmime-4.3.1.jar index 55dd8aecf..f6ee60e26 100644 Binary files a/lib/httpmime-4.3.jar and b/lib/httpmime-4.3.1.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index ca5a5d3bb..40724c29e 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -73,7 +73,7 @@ source htroot - lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.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.3.jar;lib/fontbox-1.7.1.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-13.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.jar;lib/httpcore-4.3.jar;lib/httpmime-4.3.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.7.1.jar;lib/jena-2.6.4.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-1.2.17.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.2.1.jar;lib/lucene-analyzers-phonetic-4.2.1.jar;lib/lucene-core-4.2.1.jar;lib/lucene-misc-4.2.1.jar;lib/lucene-spatial-4.2.1.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.1.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.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.2.1.jar;lib/solr-solrj-4.2.1.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar + lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.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.3.jar;lib/fontbox-1.7.1.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-13.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.1.jar;lib/httpcore-4.3.jar;lib/httpmime-4.3.1.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.7.1.jar;lib/jena-2.6.4.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-1.2.17.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.2.1.jar;lib/lucene-analyzers-phonetic-4.2.1.jar;lib/lucene-core-4.2.1.jar;lib/lucene-misc-4.2.1.jar;lib/lucene-spatial-4.2.1.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.1.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.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.2.1.jar;lib/solr-solrj-4.2.1.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar 1.6