Upgrading httpcomponents

SeleniumHQ · May 9, 2018 · 4351f22 · 4351f22
1 parent 7129729
commit 4351f22
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 24 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
@@ -15,14 +15,14 @@
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-util-9.4.8.v20171121.jar" sourcepath="/third-party/java/jetty/jetty-util-9.4.8.v20171121-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet/javax.servlet-api-3.1.0.jar" sourcepath="/third-party/java/servlet/javax.servlet-api-3.1.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.3.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.3-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.6.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.6-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.5-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.9.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.2.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.6.jar" sourcepath="/third-party/java/commons-io/commons-io-2.7-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.10.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.10-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/css/sac-1.3.jar" sourcepath="/third-party/java/css/sac-1.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons/commons-lang3-3.7.jar" sourcepath="/third-party/java/commons/commons-lang3-3.7-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.3.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5.3-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.5.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.24.jar" sourcepath="/third-party/java/cssparser/cssparser-0.9.24-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xerces/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xerces/xercesImpl-2.11.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xalan/xalan-2.7.2.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/gson/gson-2.8.2.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet/javax.servlet-api-3.1.0.jar" sourcepath="/third-party/java/servlet/javax.servlet-api-3.1.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.3.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.3-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.6.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.6-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.5-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.9.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.9-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-4.12.jar" sourcepath="/third-party/java/junit/junit-4.12-sources.jar"/>

diff --git a/rake-tasks/buck.rb b/rake-tasks/buck.rb
@@ -27,8 +27,8 @@ def self.download
       out_dir = File.dirname out
       FileUtils.mkdir_p(out_dir) unless File.exist?(out_dir)
 
-      require "third_party/java/httpcomponents/httpcore-4.4.6"
-      require "third_party/java/httpcomponents/httpclient-4.5.3"
+      require "third_party/java/httpcomponents/httpcore-4.4.9"
+      require "third_party/java/httpcomponents/httpclient-4.5.5"
       require "third_party/java/commons-logging/commons-logging-1.2"
       require "third_party/java/commons-io/commons-io-2.6"
 

diff --git a/third_party/java/httpcomponents/BUCK b/third_party/java/httpcomponents/BUCK
@@ -1,8 +1,8 @@
 prebuilt_jar(
   name = 'httpclient',
-  maven_coords = 'org.apache.httpcomponents:httpclient:jar:4.5.3',
-  binary_jar = 'httpclient-4.5.3.jar',
-  source_jar = 'httpclient-4.5.3-sources.jar',
+  maven_coords = 'org.apache.httpcomponents:httpclient:jar:4.5.5',
+  binary_jar = 'httpclient-4.5.5.jar',
+  source_jar = 'httpclient-4.5.5-sources.jar',
   deps = [
     ':httpcore',
     '//third_party/java/commons-codec:commons-codec',
@@ -18,21 +18,20 @@ prebuilt_jar(
 
 prebuilt_jar(
   name = 'httpcore',
-  maven_coords = 'org.apache.httpcomponents:httpcore:jar:4.4.6',
-  binary_jar = 'httpcore-4.4.6.jar',
-  source_jar = 'httpcore-4.4.6-sources.jar',
+  maven_coords = 'org.apache.httpcomponents:httpcore:jar:4.4.9',
+  binary_jar = 'httpcore-4.4.9.jar',
+  source_jar = 'httpcore-4.4.9-sources.jar',
 )
 
 prebuilt_jar(
   name = 'httpmime',
-  maven_coords = 'org.apache.httpcomponents:httpmime:jar:4.5.3',
-  binary_jar = 'httpmime-4.5.3.jar',
-  source_jar = 'httpmime-4.5.3-sources.jar',
+  maven_coords = 'org.apache.httpcomponents:httpmime:jar:4.5.5',
+  binary_jar = 'httpmime-4.5.5.jar',
+  source_jar = 'httpmime-4.5.5-sources.jar',
   deps = [
     ':httpclient'
   ],
   visibility = [
     '//third_party/java/htmlunit:htmlunit'
   ],
 )
-
diff --git a/third_party/java/httpcomponents/httpclient-4.5.3.jar b/third_party/java/httpcomponents/httpclient-4.5.3.jar
diff --git a/...tpcomponents/httpclient-4.5.3-sources.jar → ...tpcomponents/httpclient-4.5.5-sources.jar b/...tpcomponents/httpclient-4.5.3-sources.jar → ...tpcomponents/httpclient-4.5.5-sources.jar
diff --git a/third_party/java/httpcomponents/httpclient-4.5.5.jar b/third_party/java/httpcomponents/httpclient-4.5.5.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.6-sources.jar b/third_party/java/httpcomponents/httpcore-4.4.6-sources.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.6.jar b/third_party/java/httpcomponents/httpcore-4.4.6.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.9-sources.jar b/third_party/java/httpcomponents/httpcore-4.4.9-sources.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.9.jar b/third_party/java/httpcomponents/httpcore-4.4.9.jar
diff --git a/third_party/java/httpcomponents/httpmime-4.5.3.jar b/third_party/java/httpcomponents/httpmime-4.5.3.jar
diff --git a/...httpcomponents/httpmime-4.5.3-sources.jar → ...httpcomponents/httpmime-4.5.5-sources.jar b/...httpcomponents/httpmime-4.5.3-sources.jar → ...httpcomponents/httpmime-4.5.5-sources.jar
diff --git a/third_party/java/httpcomponents/httpmime-4.5.5.jar b/third_party/java/httpcomponents/httpmime-4.5.5.jar