summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.classpath4
-rw-r--r--addon/YaCy.app/Contents/Info.plist4
-rw-r--r--build.xml4
-rw-r--r--lib/dependencies.txt2
-rw-r--r--lib/httpclient-4.3.5.License (renamed from lib/httpclient-4.3.4.License)0
-rw-r--r--lib/httpclient-4.3.5.jar (renamed from lib/httpclient-4.3.4.jar)bin590004 -> 590533 bytes
-rw-r--r--lib/httpmime-4.3.5.License (renamed from lib/httpmime-4.3.4.License)0
-rw-r--r--lib/httpmime-4.3.5.jar (renamed from lib/httpmime-4.3.4.jar)bin37276 -> 37277 bytes
-rw-r--r--nbproject/project.xml2
-rw-r--r--pom.xml4
10 files changed, 10 insertions, 10 deletions
diff --git a/.classpath b/.classpath
index 553d8bd52..8411b1ea8 100644
--- a/.classpath
+++ b/.classpath
@@ -31,9 +31,9 @@
<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/httpclient-4.3.4.jar"/>
+ <classpathentry kind="lib" path="lib/httpclient-4.3.5.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.3.2.jar"/>
- <classpathentry kind="lib" path="lib/httpmime-4.3.4.jar"/>
+ <classpathentry kind="lib" path="lib/httpmime-4.3.5.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.5.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index bc7874a5f..15081af9f 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -51,9 +51,9 @@
<string>$JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string>
<string>$JAVAROOT/lib/guava-16.0.1.jar</string>
<string>$JAVAROOT/lib/htmllexer.jar</string>
- <string>$JAVAROOT/lib/httpclient-4.3.4.jar</string>
+ <string>$JAVAROOT/lib/httpclient-4.3.5.jar</string>
<string>$JAVAROOT/lib/httpcore-4.3.2.jar</string>
- <string>$JAVAROOT/lib/httpmime-4.3.4.jar</string>
+ <string>$JAVAROOT/lib/httpmime-4.3.5.jar</string>
<string>$JAVAROOT/lib/icu4j-core.jar</string>
<string>$JAVAROOT/lib/J7Zip-modified.jar</string>
<string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string>
diff --git a/build.xml b/build.xml
index 23d884e3b..9a76995d9 100644
--- a/build.xml
+++ b/build.xml
@@ -175,9 +175,9 @@
<pathelement location="${lib}/geronimo-stax-api_1.0_spec-1.0.1.jar" />
<pathelement location="${lib}/guava-16.0.1.jar" />
<pathelement location="${lib}/htmllexer.jar" />
- <pathelement location="${lib}/httpclient-4.3.4.jar" />
+ <pathelement location="${lib}/httpclient-4.3.5.jar" />
<pathelement location="${lib}/httpcore-4.3.2.jar" />
- <pathelement location="${lib}/httpmime-4.3.4.jar" />
+ <pathelement location="${lib}/httpmime-4.3.5.jar" />
<pathelement location="${lib}/icu4j-core.jar" />
<pathelement location="${lib}/J7Zip-modified.jar" />
<pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
diff --git a/lib/dependencies.txt b/lib/dependencies.txt
index 3437be10f..965da9d6f 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.4.jar
+httpclient-4.3.5.jar
httpcore-4.3.2.jar
jcl-over-slf4j-1.6.1.jar
log4j-over-slf4j-1.6.1.jar
diff --git a/lib/httpclient-4.3.4.License b/lib/httpclient-4.3.5.License
index d9a10c0d8..d9a10c0d8 100644
--- a/lib/httpclient-4.3.4.License
+++ b/lib/httpclient-4.3.5.License
diff --git a/lib/httpclient-4.3.4.jar b/lib/httpclient-4.3.5.jar
index f8a7afebb..1db1225f3 100644
--- a/lib/httpclient-4.3.4.jar
+++ b/lib/httpclient-4.3.5.jar
Binary files differ
diff --git a/lib/httpmime-4.3.4.License b/lib/httpmime-4.3.5.License
index d9a10c0d8..d9a10c0d8 100644
--- a/lib/httpmime-4.3.4.License
+++ b/lib/httpmime-4.3.5.License
diff --git a/lib/httpmime-4.3.4.jar b/lib/httpmime-4.3.5.jar
index 85935538e..8a02dd229 100644
--- a/lib/httpmime-4.3.4.jar
+++ b/lib/httpmime-4.3.5.jar
Binary files differ
diff --git a/nbproject/project.xml b/nbproject/project.xml
index ef3b66dde..7838d2697 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/commons-codec-1.7.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.6.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-16.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.4.jar;lib/httpcore-4.3.2.jar;lib/httpmime-4.3.4.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.6.jar;lib/jetty-client-9.2.2.v20140723.jar;lib/jetty-continuation-9.2.2.v20140723.jar;lib/jetty-deploy-9.2.2.v20140723.jar;lib/jetty-http-9.2.2.v20140723.jar;lib/jetty-io-9.2.2.v20140723.jar;lib/jetty-jmx-9.2.2.v20140723.jar;lib/jetty-proxy-9.2.2.v20140723.jar;lib/jetty-security-9.2.2.v20140723.jar;lib/jetty-server-9.2.2.v20140723.jar;lib/jetty-servlet-9.2.2.v20140723.jar;lib/jetty-servlets-9.2.2.v20140723.jar;lib/jetty-util-9.2.2.v20140723.jar;lib/jetty-webapp-9.2.2.v20140723.jar;lib/jetty-xml-9.2.2.v20140723.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.9.0.jar;lib/lucene-analyzers-phonetic-4.9.0.jar;lib/lucene-classification-4.9.0.jar;lib/lucene-codecs-4.9.0.jar;lib/lucene-core-4.9.0.jar;lib/lucene-facet-4.9.0.jar;lib/lucene-grouping-4.9.0.jar;lib/lucene-highlighter-4.9.0.jar;lib/lucene-join-4.9.0.jar;lib/lucene-memory-4.9.0.jar;lib/lucene-misc-4.9.0.jar;lib/lucene-queries-4.9.0.jar;lib/lucene-queryparser-4.9.0.jar;lib/lucene-spatial-4.9.0.jar;lib/lucene-suggest-4.9.0.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.6.jar;lib/poi-3.10-FINAL-20140208.jar;lib/poi-scratchpad-3.10-FINAL-20140208.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.9.0.jar;lib/solr-solrj-4.9.0.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/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/commons-codec-1.7.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.6.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-16.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.5.jar;lib/httpcore-4.3.2.jar;lib/httpmime-4.3.5.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.6.jar;lib/jetty-client-9.2.2.v20140723.jar;lib/jetty-continuation-9.2.2.v20140723.jar;lib/jetty-deploy-9.2.2.v20140723.jar;lib/jetty-http-9.2.2.v20140723.jar;lib/jetty-io-9.2.2.v20140723.jar;lib/jetty-jmx-9.2.2.v20140723.jar;lib/jetty-proxy-9.2.2.v20140723.jar;lib/jetty-security-9.2.2.v20140723.jar;lib/jetty-server-9.2.2.v20140723.jar;lib/jetty-servlet-9.2.2.v20140723.jar;lib/jetty-servlets-9.2.2.v20140723.jar;lib/jetty-util-9.2.2.v20140723.jar;lib/jetty-webapp-9.2.2.v20140723.jar;lib/jetty-xml-9.2.2.v20140723.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.9.0.jar;lib/lucene-analyzers-phonetic-4.9.0.jar;lib/lucene-classification-4.9.0.jar;lib/lucene-codecs-4.9.0.jar;lib/lucene-core-4.9.0.jar;lib/lucene-facet-4.9.0.jar;lib/lucene-grouping-4.9.0.jar;lib/lucene-highlighter-4.9.0.jar;lib/lucene-join-4.9.0.jar;lib/lucene-memory-4.9.0.jar;lib/lucene-misc-4.9.0.jar;lib/lucene-queries-4.9.0.jar;lib/lucene-queryparser-4.9.0.jar;lib/lucene-spatial-4.9.0.jar;lib/lucene-suggest-4.9.0.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.6.jar;lib/poi-3.10-FINAL-20140208.jar;lib/poi-scratchpad-3.10-FINAL-20140208.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.9.0.jar;lib/solr-solrj-4.9.0.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/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 a199ae06f..82bc04c33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,7 +358,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -368,7 +368,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.3.4</version>
+ <version>4.3.5</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>