Bump the version of httpclient to 4.5.1 (including updating deps)

This also adds the BUCK files "maven_coords".
SeleniumHQ · Oct 9, 2015 · be8a6fd · be8a6fd
1 parent 06a8a62
commit be8a6fd
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 31 deletions.
diff --git a/.idea/libraries/commons_httpclient.xml b/.idea/libraries/commons_httpclient.xml
diff --git a/.idea/libraries/commons_logging.xml b/.idea/libraries/commons_logging.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -16,9 +16,9 @@
 	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.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/phantomjs-driver/phantomjsdriver-1.2.1.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.3.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.3-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.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.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"/>

diff --git a/java/client/src/org/openqa/selenium/BUCK b/java/client/src/org/openqa/selenium/BUCK
@@ -1,4 +1,5 @@
 java_library(name = 'webdriver-api',
+  maven_coords = "org.seleniumhq.selenium:selenium-api:2.49.0",
   exported_deps = [
     ':beta',
     ':core',

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -6,14 +6,14 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
 	<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.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.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.3.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.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-4.12.jar" sourcepath="/third-party/java/junit/junit-4.12-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcprov-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcprov-jdk15on-1.48-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked-5.jar" sourcepath="/third-party/java/jetty/jetty-repacked-5-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-logging/commons-logging-1.2.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mx4j/mx4j-tools-3.0.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jcip_annotations/jcip-annotations-1.0.jar" sourcepath="/third-party/java/jcip_annotations/jcip-annotations-1.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar"/>

diff --git a/third_party/java/commons-codec/BUCK b/third_party/java/commons-codec/BUCK
@@ -1,7 +1,10 @@
-prebuilt_jar(name = 'commons-codec',
+prebuilt_jar(
+  name = 'commons-codec',
+  maven_coords = 'commons-codec:commons-codec:jar:1.10',
   binary_jar = 'commons-codec-1.10.jar',
-  source_jar = 'commons-codec-1.10-sources.jar',
+  source_jar = 'commons-codec-1.10.jar',
   visibility = [
-    '//third_party/java/...',
+    '//third_party/java/...'
   ],
 )
+
diff --git a/third_party/java/commons-logging/BUCK b/third_party/java/commons-logging/BUCK
@@ -1,8 +1,12 @@
-prebuilt_jar(name = 'commons-logging',
-  binary_jar = 'commons-logging-1.1.3.jar',
+prebuilt_jar(
+  name = 'commons-logging',
+  maven_coords = 'commons-logging:commons-logging:jar:1.2',
+  binary_jar = 'commons-logging-1.2.jar',
+  source_jar = 'commons-logging-1.2-sources.jar',
   visibility = [
     '//java/server/src/org/openqa/selenium/remote/server:sessions',
     '//java/server/src/org/openqa/selenium/server:server',
     '//third_party/java/...',
   ],
 )
+
diff --git a/third_party/java/commons-logging/build.desc b/third_party/java/commons-logging/build.desc
@@ -1,5 +1,5 @@
 java_library(name = "commons-logging",
   deps = [
-    "commons-logging-1.1.3.jar"
+    "commons-logging-1.2.jar"
   ]
 )
diff --git a/third_party/java/commons-logging/commons-logging-1.1.3.jar b/third_party/java/commons-logging/commons-logging-1.1.3.jar
diff --git a/third_party/java/commons-logging/commons-logging-1.2-sources.jar b/third_party/java/commons-logging/commons-logging-1.2-sources.jar
diff --git a/third_party/java/commons-logging/commons-logging-1.2.jar b/third_party/java/commons-logging/commons-logging-1.2.jar
diff --git a/third_party/java/guava-libraries/BUCK b/third_party/java/guava-libraries/BUCK
@@ -1,4 +1,5 @@
 prebuilt_jar(name = 'guava-libraries',
+  maven_coords = "com.google.guava:guava:18.0",
   binary_jar = 'guava-18.0.jar',
   source_jar = 'guava-18.0-sources.jar',
   visibility = ['PUBLIC'],

diff --git a/third_party/java/httpcomponents/BUCK b/third_party/java/httpcomponents/BUCK
@@ -1,26 +1,40 @@
-java_library(name = "httpclient",
+java_library(
+  name = 'httpclient',
   exported_deps = [
     ':client',
     ':core',
     ':mime',
+  ],
+  deps = [
     '//third_party/java/apache-mime4j:apache-mime4j',
-    '//third_party/java/commons-codec:commons-codec',
-    '//third_party/java/commons-logging:commons-logging',
+    '//third_party/java/commons-logging:commons-logging'
   ],
   visibility = ['PUBLIC'],
 )
 
-prebuilt_jar(name = 'client',
-  binary_jar = 'httpclient-4.5.jar',
-  source_jar = 'httpclient-4.5-sources.jar',
+prebuilt_jar(
+  name = 'client',
+  maven_coords = 'org.apache.httpcomponents:httpclient:jar:4.5.1',
+  binary_jar = 'httpclient-4.5.1.jar',
+  source_jar = 'httpclient-4.5.1-sources.jar',
+  deps = [
+    ':core',
+    '//third_party/java/commons-codec:commons-codec',
+    '//third_party/java/commons-logging:commons-logging'
+  ],
 )
 
-prebuilt_jar(name = 'core',
-  binary_jar = 'httpcore-4.4.1.jar',
-  source_jar = 'httpcore-4.4.1-sources.jar',
+prebuilt_jar(
+  name = 'core',
+  maven_coords = 'org.apache.httpcomponents:httpcore:jar:4.4.3',
+  binary_jar = 'httpcore-4.4.3.jar',
+  source_jar = 'httpcore-4.4.3-sources.jar',
 )
 
-prebuilt_jar(name = 'mime',
+prebuilt_jar(
+  name = 'mime',
+  maven_coords = 'org.apache.httpcomponents:httpmime:jar:4.5',
   binary_jar = 'httpmime-4.5.jar',
   source_jar = 'httpmime-4.5-sources.jar',
 )
+
diff --git a/third_party/java/httpcomponents/build.desc b/third_party/java/httpcomponents/build.desc
@@ -1,7 +1,7 @@
 java_library(name = "httpclient",
   deps = [
-    "httpclient-4.5.jar",
-    "httpcore-4.4.1.jar",
+    "httpclient-4.5.1.jar",
+    "httpcore-4.4.3.jar",
     "httpmime-4.5.jar",
     "//third_party/java/apache-mime4j",
     "//third_party/java/commons-codec",

diff --git a/...httpcomponents/httpclient-4.5-sources.jar → ...tpcomponents/httpclient-4.5.1-sources.jar b/...httpcomponents/httpclient-4.5-sources.jar → ...tpcomponents/httpclient-4.5.1-sources.jar
diff --git a/...ty/java/httpcomponents/httpclient-4.5.jar → .../java/httpcomponents/httpclient-4.5.1.jar b/...ty/java/httpcomponents/httpclient-4.5.jar → .../java/httpcomponents/httpclient-4.5.1.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.1.jar b/third_party/java/httpcomponents/httpcore-4.4.1.jar
diff --git a/...httpcomponents/httpcore-4.4.1-sources.jar → ...httpcomponents/httpcore-4.4.3-sources.jar b/...httpcomponents/httpcore-4.4.1-sources.jar → ...httpcomponents/httpcore-4.4.3-sources.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.3.jar b/third_party/java/httpcomponents/httpcore-4.4.3.jar