Bump the version of htmlunit to 2.23 (plus dependencies)

Also bump all the dependencies that it depends on too.

java/client/.classpath

@@ -7,27 +7,27 @@
 	<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/guava/guava-19.0.jar" sourcepath="/third-party/java/guava/guava-19.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.21.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.21-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.21.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.21-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar" />
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-driver-2.21.jar" sourcepath="/third-party/java/htmlunit/htmlunit-driver-2.21.jar"/>
+	<classpathentry kind="lib" path="/Users/simons/src/selenium/trunk/third_party/java/htmlunit/htmlunit-2.23.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.21-sources.jar"/>
+	<classpathentry kind="lib" path="/Users/simons/src/selenium/trunk/third_party/java/htmlunit/neko-htmlunit-2.23.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.21-sources.jar"/>
+	<classpathentry kind="lib" path="/Users/simons/src/selenium/trunk/third_party/java/htmlunit/htmlunit-core-js-2.23.jar"/>
+	<classpathentry kind="lib" path="/Users/simons/src/selenium/trunk/third_party/java/selenium/htmlunit-driver-2.23.jar" sourcepath="/third-party/java/htmlunit/htmlunit-driver-2.21.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-4.1.0.jar" sourcepath="/third-party/java/jna/jna-platform-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-exec/commons-exec-1.3.jar" sourcepath="/third-party/java/commons-exec/commons-exec-1.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
+	<classpathentry kind="lib" path="/Users/simons/src/selenium/trunk/third_party/java/cglib/cglib-nodep-3.2.4.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.3.0.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.3.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpclient-4.5.2.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.2-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.4.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.4-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="/Users/simons/src/selenium/trunk/third_party/java/commons-io/commons-io-2.5.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"/>
 	<classpathentry kind="lib" path="/third-party/java/commons/commons-lang3-3.4.jar" sourcepath="/third-party/java/commons/commons-lang3-3.4-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.2.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5.2-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-collections/commons-collections-3.2.2.jar" sourcepath="/third-party/java/commons-collections/commons-collections-3.2.2-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.18.jar"/>
+	<classpathentry kind="lib" path="/Users/simons/src/selenium/trunk/third_party/java/cssparser/cssparser-0.9.20.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"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-fileupload/commons-fileupload-1.2.2.jar" sourcepath="/third-party/java/commons-fileupload/commons-fileupload-1.2.2-src.jar"/>

java/client/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

java/client/test/org/openqa/selenium/htmlunit/BUCK

@@ -10,8 +10,7 @@ java_test(name = 'htmlunit',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/test/org/openqa/selenium:large-tests',
     '//java/client/test/org/openqa/selenium:tests',
-    '//third_party/java/htmlunit:htmlunit',
-    '//third_party/java/htmlunit:htmlunit-driver',
+    '//third_party/java/selenium:htmlunit-driver',
     '//third_party/java/junit:junit',
   ],
 )
@@ -28,7 +27,7 @@ java_test(name = 'htmlunit-no-js',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/test/org/openqa/selenium:large-tests',
     '//java/client/test/org/openqa/selenium:tests',
-    '//third_party/java/htmlunit:htmlunit-driver',
+    '//third_party/java/selenium:htmlunit-driver',
     '//third_party/java/junit:junit',
   ],
 )

java/client/test/org/openqa/selenium/testing/BUCK

@@ -54,10 +54,10 @@ java_library(name = 'test-base',
     '//third_party/java/guava:guava',
     '//third_party/java/hamcrest:hamcrest',
     '//third_party/java/htmlunit:htmlunit',
-    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/junit:junit',
     '//third_party/java/little_proxy:little_proxy',
     '//third_party/java/netty:netty',
+    '//third_party/java/selenium:htmlunit-driver',
   ],
   visibility = [
     '//java/client/test/...',

java/server/.classpath

@@ -11,12 +11,9 @@
 	<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="/Users/simons/src/selenium/trunk/build/third_party/java/jetty/jetty-repacked.jar" sourcepath="/third-party/java/jetty/jetty-repacked-5-sources.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"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava/guava-19.0.jar" sourcepath="/third-party/java/guava/guava-19.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>

java/server/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

java/server/src/org/openqa/selenium/remote/server/BUCK

@@ -7,7 +7,6 @@ java_library(name = 'sessions',
   deps = [
     '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//third_party/java/commons-logging:commons-logging',
     '//third_party/java/guava:guava',
   ],
   visibility = [
@@ -92,9 +91,9 @@ java_library(name = 'standalone-server-lib',
     '//java/client/src/org/openqa/selenium/safari:safari',
     '//java/server/src/org/openqa/grid:grid',
     '//third_party/java/beust:jcommander',
-    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/jetty:jetty',
     '//third_party/java/phantomjs-driver:phantomjs-driver',
+    '//third_party/java/selenium:htmlunit-driver',
     '//third_party/java/servlet:servlet-api',
   ],
   visibility = [

java/server/test/org/openqa/grid/e2e/BUCK

@@ -21,10 +21,10 @@ java_library(name = 'tests',
     '//java/server/src/org/openqa/grid/selenium:classes',
     '//third_party/java/beust:jcommander',
     '//third_party/java/guava:guava',
-    '//third_party/java/htmlunit:htmlunit-driver',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/junit:junit',
     '//third_party/java/mockito:mockito',
+    '//third_party/java/selenium:htmlunit-driver',
     '//third_party/java/servlet:servlet-api',
   ],
 )

third_party/java/cglib/BUCK

@@ -1,6 +1,8 @@
-prebuilt_jar(name = 'cglib',
-  maven_coords = 'cglib:cglib-nodep:3.2.4',
+prebuilt_jar(
+  name = 'cglib',
+  maven_coords = 'cglib:cglib-nodep:jar:3.2.4',
   binary_jar = 'cglib-nodep-3.2.4.jar',
+  source_jar = 'cglib-nodep-3.2.4-sources.jar',
   visibility = [
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],

third_party/java/commons-codec/BUCK

@@ -2,9 +2,11 @@ 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.jar',
+  source_jar = 'commons-codec-1.10-sources.jar',
   visibility = [
-    '//third_party/java/...'
+    '//third_party/java/htmlunit:htmlunit',
+    '//third_party/java/httpcomponents:client',
+    '//third_party/java/little_proxy:little_proxy',
   ],
 )
 

third_party/java/commons-io/BUCK

@@ -1,7 +1,11 @@
-prebuilt_jar(name = 'commons-io',
-  binary_jar = 'commons-io-2.4.jar',
-  source_jar = 'commons-io-2.4-sources.jar',
+prebuilt_jar(
+  name = 'commons-io',
+  maven_coords = 'commons-io:commons-io:jar:2.5',
+  binary_jar = 'commons-io-2.5.jar',
+  source_jar = 'commons-io-2.5-sources.jar',
   visibility = [
-    '//third_party/java/...',
+    '//third_party/java/htmlunit:htmlunit-jar',
+    '//third_party/java/little_proxy:little_proxy',
   ],
 )
+

third_party/java/commons-logging/BUCK

@@ -4,9 +4,8 @@ prebuilt_jar(
   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/...',
+    '//third_party/java/htmlunit:',
+    '//third_party/java/httpcomponents:client',
   ],
 )
 

third_party/java/css/BUCK

@@ -1,7 +1,10 @@
-prebuilt_jar(name = 'sac',
+prebuilt_jar(
+  name = 'sac',
+  maven_coords = 'org.w3c.css:sac:jar:1.3',
   binary_jar = 'sac-1.3.jar',
+  source_jar = 'sac-1.3-sources.jar',
   visibility = [
-    '//third_party/java/...',
+    '//third_party/java/cssparser:cssparser'
   ],
 )
 

third_party/java/cssparser/BUCK

@@ -1,10 +1,13 @@
-prebuilt_jar(name = 'cssparser',
-  binary_jar = 'cssparser-0.9.18.jar',
-  source_jar = 'cssparser-0.9.18-sources.jar',
+prebuilt_jar(
+  name = 'cssparser',
+  maven_coords = 'net.sourceforge.cssparser:cssparser:jar:0.9.20',
+  binary_jar = 'cssparser-0.9.20.jar',
+  source_jar = 'cssparser-0.9.20-sources.jar',
   deps = [
-    '//third_party/java/css:sac',
+    '//third_party/java/css:sac'
   ],
   visibility = [
-    '//third_party/java/...',
+    '//third_party/java/htmlunit:htmlunit-jar'
   ],
 )
+

third_party/java/gson/BUCK

@@ -1,5 +1,10 @@
-prebuilt_jar(name = 'gson',
-  maven_coords = 'com.google.code.gson:gson:2.3.1',
+prebuilt_jar(
+  name = 'gson',
+  maven_coords = 'com.google.code.gson:gson:jar:2.3.1',
   binary_jar = 'gson-2.3.1.jar',
-  visibility = [ 'PUBLIC' ],
+  source_jar = 'gson-2.3.1-sources.jar',
+  visibility = [
+    'PUBLIC',
+  ],
 )
+

third_party/java/guava/BUCK

@@ -1,6 +1,10 @@
-prebuilt_jar(name = 'guava',
-  maven_coords = "com.google.guava:guava:19.0",
+prebuilt_jar(
+  name = 'guava',
+  maven_coords = 'com.google.guava:guava:jar:19.0',
   binary_jar = 'guava-19.0.jar',
   source_jar = 'guava-19.0-sources.jar',
-  visibility = ['PUBLIC'],
+  visibility = [
+    'PUBLIC',
+  ],
 )
+

third_party/java/htmlunit/BUCK

@@ -1,44 +1,48 @@
-prebuilt_jar(name = 'htmlunit-driver',
-  maven_coords = 'org.seleniumhq.selenium:htmlunit-driver:2.21',
-  binary_jar = 'htmlunit-driver-2.21.jar',
-  deps = [
-    ':htmlunit',
-  ],
-  visibility = ['PUBLIC'],
-)
-
-java_library(name = 'htmlunit',
+java_library(
+  name = 'htmlunit',
   exported_deps = [
     ':htmlunit-jar',
-    ':js-core',
+    ':htmlunit-core-js',
   ],
   deps = [
-    ':neko-htmlunit',
-    '//third_party/java/httpcomponents:httpclient',
-    '//third_party/java/commons-io:commons-io',
-    '//third_party/java/commons:commons-lang',
-    '//third_party/java/cssparser:cssparser',
     '//third_party/java/websocket:websocket-client',
-    '//third_party/java/xml:xml',
   ],
   visibility = [
-    '//java/client/test/org/openqa/selenium/atoms:tests',
-    '//java/client/test/org/openqa/selenium/htmlunit:',
-    '//java/client/test/org/openqa/selenium/testing:test-base',
+    'PUBLIC',
   ],
 )
 
-prebuilt_jar(name = 'htmlunit-jar',
-  binary_jar = 'htmlunit-2.21.jar',
-  source_jar = 'htmlunit-2.21-sources.jar',
+prebuilt_jar(
+  name = 'htmlunit-jar',
+  maven_coords = 'net.sourceforge.htmlunit:htmlunit:jar:2.23',
+  binary_jar = 'htmlunit-2.23.jar',
+  source_jar = 'htmlunit-2.23-sources.jar',
+  deps = [
+    ':htmlunit-core-js',
+    ':neko-htmlunit',
+    '//third_party/java/commons:commons-lang',
+    '//third_party/java/commons-io:commons-io',
+    '//third_party/java/commons-logging:commons-logging',
+    '//third_party/java/cssparser:cssparser',
+    '//third_party/java/httpcomponents:httpclient',
+    '//third_party/java/xml:xml'
+  ],
 )
 
-prebuilt_jar(name = 'js-core',
-  binary_jar = 'htmlunit-core-js-2.17.jar',
-  source_jar = 'htmlunit-core-js-2.17-sources.jar',
+prebuilt_jar(
+  name = 'htmlunit-core-js',
+  maven_coords = 'net.sourceforge.htmlunit:htmlunit-core-js:jar:2.23',
+  binary_jar = 'htmlunit-core-js-2.23.jar',
+  source_jar = 'htmlunit-core-js-2.23-sources.jar',
 )
 
-prebuilt_jar(name = 'neko-htmlunit',
-  binary_jar = 'neko-htmlunit-2.21.jar',
-  source_jar = 'neko-htmlunit-2.21-sources.jar',
+prebuilt_jar(
+  name = 'neko-htmlunit',
+  maven_coords = 'net.sourceforge.htmlunit:neko-htmlunit:jar:2.23',
+  binary_jar = 'neko-htmlunit-2.23.jar',
+  source_jar = 'neko-htmlunit-2.23-sources.jar',
+  deps = [
+    '//third_party/java/xml:xml'
+  ],
 )
+