Bump the version of httpclient to 4.3.6

HttpClient versions prior to 4.3.6 are susceptible to a MITM attack during hostname verification. http://mail-archives.apache.org/mod_mbox/www-announce/201408.mbox/CVE-2014-3577
Why-Not-Sky · Nov 15, 2014 · 8f771f2 · 8f771f2
1 parent 13b0b80
commit 8f771f2
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/.idea/libraries/commons_httpclient.xml b/.idea/libraries/commons_httpclient.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -18,14 +18,14 @@
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/opera-driver/operadriver-1.5.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.1.0.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.1.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.4-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.2.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.2-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.6-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.4.jar" sourcepath="/third-party/java/commons-io/commons-io-2.4-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.9.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/sac/sac-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.3.2.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.3.2-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.4-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.6-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-collections/commons-collections-3.2.1.jar" sourcepath="/third-party/java/commons-collections/commons-collections-3.2.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.14.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xml/xercesImpl-2.11.0-sources.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -6,8 +6,8 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
 	<classpathentry kind="lib" path="/third-party/java/json/json-20080701.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.4-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.2.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.4-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.6.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.6-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.11.jar" sourcepath="/third-party/java/junit/junit-dep-4.11-src.jar"/>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -180,12 +180,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.3.4</version>
+                <version>4.3.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.3.2</version>
+                <version>4.3.3</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>

diff --git a/third_party/java/apache-httpclient/BUCK b/third_party/java/apache-httpclient/BUCK
@@ -11,16 +11,16 @@ java_library(name = "apache-httpclient",
 )
 
 prebuilt_jar(name = 'client',
-  binary_jar = 'httpclient-4.3.4.jar',
-  source_jar = 'httpclient-4.3.4-sources.jar',
+  binary_jar = 'httpclient-4.3.6.jar',
+  source_jar = 'httpclient-4.3.6-sources.jar',
 )
 
 prebuilt_jar(name = 'core',
-  binary_jar = 'httpcore-4.3.2.jar',
-  source_jar = 'httpcore-4.3.2-sources.jar',
+  binary_jar = 'httpcore-4.3.3.jar',
+  source_jar = 'httpcore-4.3.3-sources.jar',
 )
 
 prebuilt_jar(name = 'mime',
-  binary_jar = 'httpmime-4.3.4.jar',
-  source_jar = 'httpmime-4.3.4-sources.jar',
+  binary_jar = 'httpmime-4.3.6.jar',
+  source_jar = 'httpmime-4.3.6-sources.jar',
 )
diff --git a/third_party/java/apache-httpclient/build.desc b/third_party/java/apache-httpclient/build.desc
@@ -1,9 +1,9 @@
 
 java_library(name = "apache-httpclient",
   deps = [
-    "httpclient-4.3.4.jar",
-    "httpcore-4.3.2.jar",
-    "httpmime-4.3.4.jar",
+    "httpclient-4.3.6.jar",
+    "httpcore-4.3.3.jar",
+    "httpmime-4.3.6.jar",
     "//third_party/java/apache-mime4j",
     "//third_party/java/commons-codec",
     "//third_party/java/commons-logging"

diff --git a/...e-httpclient/httpclient-4.3.4-sources.jar → ...e-httpclient/httpclient-4.3.6-sources.jar b/...e-httpclient/httpclient-4.3.4-sources.jar → ...e-httpclient/httpclient-4.3.6-sources.jar
diff --git a/...va/apache-httpclient/httpclient-4.3.4.jar → ...va/apache-httpclient/httpclient-4.3.6.jar b/...va/apache-httpclient/httpclient-4.3.4.jar → ...va/apache-httpclient/httpclient-4.3.6.jar
diff --git a/...che-httpclient/httpcore-4.3.2-sources.jar → ...che-httpclient/httpcore-4.3.3-sources.jar b/...che-httpclient/httpcore-4.3.2-sources.jar → ...che-httpclient/httpcore-4.3.3-sources.jar
diff --git a/...java/apache-httpclient/httpcore-4.3.2.jar → ...java/apache-httpclient/httpcore-4.3.3.jar b/...java/apache-httpclient/httpcore-4.3.2.jar → ...java/apache-httpclient/httpcore-4.3.3.jar
diff --git a/...che-httpclient/httpmime-4.3.4-sources.jar → ...che-httpclient/httpmime-4.3.6-sources.jar b/...che-httpclient/httpmime-4.3.4-sources.jar → ...che-httpclient/httpmime-4.3.6-sources.jar
diff --git a/...java/apache-httpclient/httpmime-4.3.4.jar → ...java/apache-httpclient/httpmime-4.3.6.jar b/...java/apache-httpclient/httpmime-4.3.4.jar → ...java/apache-httpclient/httpmime-4.3.6.jar