Move httpclient libraries around for easier automated updates.

SeleniumHQ · Jul 2, 2015 · 5600b63 · 5600b63
1 parent 7b2b44d
commit 5600b63
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 49 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
@@ -17,8 +17,8 @@
 	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.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/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/apache-httpclient/httpclient-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.4.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.4.1-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/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"/>

diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -111,7 +111,7 @@ java_library(name = 'remote',
     ':http-session-id',
     '//java/client/src/org/openqa/selenium/io:io',
     '//java/client/src/org/openqa/selenium/net:net',
-    '//third_party/java/apache-httpclient:apache-httpclient',
+    '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/guava-libraries:guava-libraries',
     '//third_party/java/gson:gson',
   ],

diff --git a/java/client/src/org/openqa/selenium/remote/build.desc b/java/client/src/org/openqa/selenium/remote/build.desc
@@ -114,6 +114,6 @@ java_library(name = "remote",
     "//java/client/src/org/openqa/selenium/logging",
     "//java/client/src/org/openqa/selenium/io",
     "//java/client/src/org/openqa/selenium/net",
-    "//third_party/java/apache-httpclient",
+    "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/guava-libraries",
   ])
diff --git a/java/client/test/org/openqa/selenium/environment/BUCK b/java/client/test/org/openqa/selenium/environment/BUCK
@@ -6,9 +6,9 @@ java_library(name = 'environment',
     '//java/client/src/org/openqa/selenium/io:io',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/test/org/openqa/selenium/testing:helpers',
-    '//third_party/java/apache-httpclient:apache-httpclient',
     '//third_party/java/commons-fileupload:commons-fileupload',
     '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/jetty:jetty',
     '//third_party/java/servlet-api:servlet-api',
     '//third_party/java/webbit:webbit',
@@ -17,4 +17,4 @@ java_library(name = 'environment',
     '//java/client/test/...',
     '//java/server/test/...',
   ],
-)
+)
diff --git a/java/client/test/org/openqa/selenium/environment/webserver/build.desc b/java/client/test/org/openqa/selenium/environment/webserver/build.desc
@@ -54,6 +54,6 @@ java_test(name = "webserver_test",
     ":webserver",
     "//java/client/src/org/openqa/selenium/chrome",
     "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//third_party/java/apache-httpclient",
+    "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/junit",
   ])
diff --git a/java/client/test/org/openqa/selenium/remote/build.desc b/java/client/test/org/openqa/selenium/remote/build.desc
@@ -13,7 +13,7 @@ java_test(name = "common-tests",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote:common",
     "//java/client/test/org/openqa/selenium:tests",
-    "//third_party/java/apache-httpclient",
+    "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/junit",
   ])
 

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.3.1.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.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.4.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.4.1.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.4.1-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/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/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -12,9 +12,9 @@ java_library(name = 'grid',
     '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
     '//java/server/src/org/openqa/selenium/server:server',
-    '//third_party/java/apache-httpclient:apache-httpclient',
     '//third_party/java/gson:gson',
     '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/jcip_annotations:jcip_annotations',
     '//third_party/java/jetty:jetty',
     '//third_party/java/jetty:jetty-for-rc',
@@ -33,4 +33,4 @@ prebuilt_jar(name = 'images',
 zip(name = 'images-zip',
   srcs = glob(['images/*']),
   out = 'images.jar',
-)
+)
diff --git a/java/server/src/org/openqa/grid/build.desc b/java/server/src/org/openqa/grid/build.desc
@@ -10,7 +10,7 @@ java_library(name = "grid",
   deps = [
     "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/server/src/org/openqa/grid/common",
-    "//third_party/java/apache-httpclient",
+    "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/guava-libraries",
     "//third_party/java/jcip_annotations",
     "//third_party/java/yaml",

diff --git a/third_party/java/apache-httpclient/BUCK b/third_party/java/apache-httpclient/BUCK
@@ -1,26 +1,7 @@
-java_library(name = "apache-httpclient",
-  exported_deps = [
-    ':client',
-    ':core',
-    ':mime',
-    '//third_party/java/apache-mime4j:apache-mime4j',
-    '//third_party/java/commons-codec:commons-codec',
-    '//third_party/java/commons-logging:commons-logging',
-  ],
-  visibility = ['PUBLIC'],
-)
-
-prebuilt_jar(name = 'client',
-  binary_jar = 'httpclient-4.4.1.jar',
-  source_jar = 'httpclient-4.4.1-sources.jar',
-)
-
-prebuilt_jar(name = 'core',
-  binary_jar = 'httpcore-4.4.1.jar',
-  source_jar = 'httpcore-4.4.1-sources.jar',
-)
-
 prebuilt_jar(name = 'mime',
   binary_jar = 'httpmime-4.4.1.jar',
   source_jar = 'httpmime-4.4.1-sources.jar',
+  visibility = [
+    '//third_party/java/httpcomponents/...',
+  ],
 )
diff --git a/third_party/java/apache-httpclient/build.desc b/third_party/java/apache-httpclient/build.desc
@@ -1,10 +1,4 @@
-
-java_library(name = "apache-httpclient",
+java_library(name = "mime",
   deps = [
-    "httpclient-4.4.1.jar",
-    "httpcore-4.4.1.jar",
     "httpmime-4.4.1.jar",
-    "//third_party/java/apache-mime4j",
-    "//third_party/java/commons-codec",
-    "//third_party/java/commons-logging"
   ])
diff --git a/third_party/java/htmlunit/BUCK b/third_party/java/htmlunit/BUCK
@@ -3,7 +3,7 @@ prebuilt_jar(name = 'htmlunit',
   source_jar = 'htmlunit-2.17-sources.jar',
   deps = [
     ':js-core',
-    '//third_party/java/apache-httpclient:apache-httpclient',
+    '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/commons-collections:commons-collections',
     '//third_party/java/commons-io:commons-io',
     '//third_party/java/commons-lang:commons-lang',

diff --git a/third_party/java/htmlunit/build.desc b/third_party/java/htmlunit/build.desc
@@ -2,11 +2,11 @@ java_library(name = "htmlunit",
   deps = [
     "htmlunit-2.17.jar",
     "htmlunit-core-js-2.17.jar",
-    "//third_party/java/apache-httpclient",
     "//third_party/java/commons-collections",
     "//third_party/java/commons-io",
     "//third_party/java/commons-lang",
     "//third_party/java/cssparser",
+    "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/nekohtml",
     "//third_party/java/serializer",
     "//third_party/java/xml",

diff --git a/third_party/java/httpcomponents/BUCK b/third_party/java/httpcomponents/BUCK
@@ -0,0 +1,22 @@
+java_library(name = "httpclient",
+  exported_deps = [
+    ':client',
+    ':core',
+    '//third_party/java/apache-httpclient:mime',
+    '//third_party/java/apache-mime4j:apache-mime4j',
+    '//third_party/java/commons-codec:commons-codec',
+    '//third_party/java/commons-logging:commons-logging',
+  ],
+  visibility = ['PUBLIC'],
+)
+
+prebuilt_jar(name = 'client',
+  binary_jar = 'httpclient-4.4.1.jar',
+  source_jar = 'httpclient-4.4.1-sources.jar',
+)
+
+prebuilt_jar(name = 'core',
+  binary_jar = 'httpcore-4.4.1.jar',
+  source_jar = 'httpcore-4.4.1-sources.jar',
+)
+
diff --git a/third_party/java/httpcomponents/build.desc b/third_party/java/httpcomponents/build.desc
@@ -0,0 +1,9 @@
+java_library(name = "httpclient",
+  deps = [
+    "httpclient-4.4.1.jar",
+    "httpcore-4.4.1.jar",
+    "//third_party/java/apache-httpclient:mime",
+    "//third_party/java/apache-mime4j",
+    "//third_party/java/commons-codec",
+    "//third_party/java/commons-logging"
+  ])
diff --git a/...e-httpclient/httpclient-4.4.1-sources.jar → ...tpcomponents/httpclient-4.4.1-sources.jar b/...e-httpclient/httpclient-4.4.1-sources.jar → ...tpcomponents/httpclient-4.4.1-sources.jar
diff --git a/...va/apache-httpclient/httpclient-4.4.1.jar → .../java/httpcomponents/httpclient-4.4.1.jar b/...va/apache-httpclient/httpclient-4.4.1.jar → .../java/httpcomponents/httpclient-4.4.1.jar
diff --git a/...che-httpclient/httpcore-4.4.1-sources.jar → ...httpcomponents/httpcore-4.4.1-sources.jar b/...che-httpclient/httpcore-4.4.1-sources.jar → ...httpcomponents/httpcore-4.4.1-sources.jar
diff --git a/...java/apache-httpclient/httpcore-4.4.1.jar → ...ty/java/httpcomponents/httpcore-4.4.1.jar b/...java/apache-httpclient/httpcore-4.4.1.jar → ...ty/java/httpcomponents/httpcore-4.4.1.jar