[java] Upgrading htmlunit (but not htmlunit-driver) and its dependencies

SeleniumHQ · Apr 7, 2019 · a652ddc · a652ddc
1 parent a16e80b
commit a652ddc
Show file tree

Hide file tree

Showing 48 changed files with 57 additions and 67 deletions.
diff --git a/.idea/libraries/commons_codec.xml b/.idea/libraries/commons_codec.xml
diff --git a/.idea/libraries/commons_httpclient.xml b/.idea/libraries/commons_httpclient.xml
diff --git a/.idea/libraries/commons_lang.xml b/.idea/libraries/commons_lang.xml
diff --git a/.idea/libraries/cssparser.xml b/.idea/libraries/cssparser.xml
diff --git a/.idea/libraries/htmlunit.xml b/.idea/libraries/htmlunit.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -7,22 +7,22 @@
 	<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-25.0-jre.jar" sourcepath="/third-party/java/guava/guava-25.0-jre-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.33.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.33-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.33.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.33-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.33.jar" sourcepath="/third-party/java/htmlunit/htmlunit-core-js-2.33-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.34.1.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.34.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.34.0.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.34.0-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.34.0.jar" sourcepath="/third-party/java/htmlunit/htmlunit-core-js-2.34.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/selenium/htmlunit-driver-2.33.4-SNAPSHOT.jar" sourcepath="/third-party/java/selenium/htmlunit-driver-2.33.4-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons/commons-exec-1.3.jar" sourcepath="/third-party/java/commons/commons-exec-1.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-util-9.4.12.v20180830.jar" sourcepath="/third-party/java/jetty/jetty-util-9.4.12.v20180830-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.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/httpcomponents/httpclient-4.5.8.jar" sourcepath="/third-party/java/httpcomponents/httpclient-4.5.8-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpcore-4.4.11.jar" sourcepath="/third-party/java/httpcomponents/httpcore-4.4.11-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/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.5.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5.5-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-cssparser-1.2.0.jar" sourcepath="/third-party/java/htmlunit/htmlunit-cssparser-1.2.0-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.12.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.12-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/commons/commons-lang3-3.8.1.jar" sourcepath="/third-party/java/commons/commons-lang3-3.8.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/httpcomponents/httpmime-4.5.8.jar" sourcepath="/third-party/java/httpcomponents/httpmime-4.5.8-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-cssparser-1.3.0.jar" sourcepath="/third-party/java/htmlunit/htmlunit-cssparser-1.3.0-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"/>
 	<classpathentry kind="lib" path="/third-party/java/littleshoot/littleproxy-1.1.3-SNAPSHOT.jar"/>

diff --git a/java/client/client.iml b/java/client/client.iml
@@ -22,7 +22,6 @@
     <orderEntry type="library" name="commons-io" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-lang" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="commons-logging" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="cssparser" level="project" />
     <orderEntry type="library" scope="TEST" name="github" level="project" />
     <orderEntry type="library" exported="" name="guava" level="project" />
     <orderEntry type="library" exported="" name="gson" level="project" />

diff --git a/third_party/java/commons-codec/BUCK b/third_party/java/commons-codec/BUCK
@@ -1,8 +1,8 @@
 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",
+    maven_coords = "commons-codec:commons-codec:jar:1.12",
+    binary_jar = "commons-codec-1.12.jar",
+    source_jar = "commons-codec-1.12-sources.jar",
     visibility = [
         "//third_party/java/httpcomponents:httpclient",
     ],

diff --git a/third_party/java/commons-codec/commons-codec-1.10-sources.jar b/third_party/java/commons-codec/commons-codec-1.10-sources.jar
diff --git a/third_party/java/commons-codec/commons-codec-1.10.jar b/third_party/java/commons-codec/commons-codec-1.10.jar
diff --git a/third_party/java/commons-codec/commons-codec-1.12-sources.jar b/third_party/java/commons-codec/commons-codec-1.12-sources.jar
diff --git a/third_party/java/commons-codec/commons-codec-1.12.jar b/third_party/java/commons-codec/commons-codec-1.12.jar
diff --git a/third_party/java/commons/BUCK b/third_party/java/commons/BUCK
@@ -10,9 +10,9 @@ prebuilt_jar(
 
 prebuilt_jar(
     name = "commons-lang3",
-    maven_coords = "org.apache.commons:commons-lang3:jar:3.7",
-    binary_jar = "commons-lang3-3.7.jar",
-    source_jar = "commons-lang3-3.7-sources.jar",
+    maven_coords = "org.apache.commons:commons-lang3:jar:3.8.1",
+    binary_jar = "commons-lang3-3.8.1.jar",
+    source_jar = "commons-lang3-3.8.1-sources.jar",
     visibility = [
         "//third_party/java/htmlunit:htmlunit",
         "//third_party/java/littleshoot:littleproxy",
@@ -23,9 +23,9 @@ prebuilt_jar(
 
 prebuilt_jar(
     name = "commons-text",
-    maven_coords = "org.apache.commons:commons-text:jar:1.1",
-    binary_jar = "commons-text-1.1.jar",
-    source_jar = "commons-text-1.1-sources.jar",
+    maven_coords = "org.apache.commons:commons-text:jar:1.6",
+    binary_jar = "commons-text-1.6.jar",
+    source_jar = "commons-text-1.6-sources.jar",
     deps = [
         ":commons-lang3",
     ],

diff --git a/third_party/java/commons/commons-lang3-3.7-sources.jar b/third_party/java/commons/commons-lang3-3.7-sources.jar
diff --git a/third_party/java/commons/commons-lang3-3.7.jar b/third_party/java/commons/commons-lang3-3.7.jar
diff --git a/third_party/java/commons/commons-lang3-3.8.1-sources.jar b/third_party/java/commons/commons-lang3-3.8.1-sources.jar
diff --git a/third_party/java/commons/commons-lang3-3.8.1.jar b/third_party/java/commons/commons-lang3-3.8.1.jar
diff --git a/third_party/java/commons/commons-text-1.1-sources.jar b/third_party/java/commons/commons-text-1.1-sources.jar
diff --git a/third_party/java/commons/commons-text-1.1.jar b/third_party/java/commons/commons-text-1.1.jar
diff --git a/third_party/java/commons/commons-text-1.6-sources.jar b/third_party/java/commons/commons-text-1.6-sources.jar
diff --git a/third_party/java/commons/commons-text-1.6.jar b/third_party/java/commons/commons-text-1.6.jar
diff --git a/third_party/java/htmlunit/BUCK b/third_party/java/htmlunit/BUCK
@@ -1,8 +1,8 @@
 prebuilt_jar(
     name = "htmlunit",
-    maven_coords = "net.sourceforge.htmlunit:htmlunit:jar:2.33",
-    binary_jar = "htmlunit-2.33.jar",
-    source_jar = "htmlunit-2.33-sources.jar",
+    maven_coords = "net.sourceforge.htmlunit:htmlunit:jar:2.34.1",
+    binary_jar = "htmlunit-2.34.1.jar",
+    source_jar = "htmlunit-2.34.1-sources.jar",
     deps = [
         ":htmlunit-core-js",
         ":neko-htmlunit",
@@ -24,27 +24,27 @@ prebuilt_jar(
 
 prebuilt_jar(
     name = "htmlunit-core-js",
-    maven_coords = "net.sourceforge.htmlunit:htmlunit-core-js:jar:2.33",
-    binary_jar = "htmlunit-core-js-2.33.jar",
-    source_jar = "htmlunit-core-js-2.33-sources.jar",
+    maven_coords = "net.sourceforge.htmlunit:htmlunit-core-js:jar:2.34.0",
+    binary_jar = "htmlunit-core-js-2.34.0.jar",
+    source_jar = "htmlunit-core-js-2.34.0-sources.jar",
     visibility = [
         "//java/client/test/...",
     ],
 )
 
 prebuilt_jar(
     name = "neko-htmlunit",
-    maven_coords = "net.sourceforge.htmlunit:neko-htmlunit:jar:2.33",
-    binary_jar = "neko-htmlunit-2.33.jar",
-    source_jar = "neko-htmlunit-2.33-sources.jar",
+    maven_coords = "net.sourceforge.htmlunit:neko-htmlunit:jar:2.34.0",
+    binary_jar = "neko-htmlunit-2.34.0.jar",
+    source_jar = "neko-htmlunit-2.34.0-sources.jar",
     deps = [
         "//third_party/java/xerces:xercesImpl",
     ],
 )
 
 prebuilt_jar(
     name = "htmlunit-cssparser",
-    maven_coords = "net.sourceforge.htmlunit:htmlunit-cssparser:jar:1.2.0",
-    binary_jar = "htmlunit-cssparser-1.2.0.jar",
-    source_jar = "htmlunit-cssparser-1.2.0-sources.jar",
+    maven_coords = "net.sourceforge.htmlunit:htmlunit-cssparser:jar:1.3.0",
+    binary_jar = "htmlunit-cssparser-1.3.0.jar",
+    source_jar = "htmlunit-cssparser-1.3.0-sources.jar",
 )
diff --git a/third_party/java/htmlunit/htmlunit-2.33-sources.jar b/third_party/java/htmlunit/htmlunit-2.33-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.33.jar b/third_party/java/htmlunit/htmlunit-2.33.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.34.1-sources.jar b/third_party/java/htmlunit/htmlunit-2.34.1-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.34.1.jar b/third_party/java/htmlunit/htmlunit-2.34.1.jar
diff --git a/third_party/java/htmlunit/htmlunit-core-js-2.33-sources.jar b/third_party/java/htmlunit/htmlunit-core-js-2.33-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-core-js-2.33.jar b/third_party/java/htmlunit/htmlunit-core-js-2.33.jar
diff --git a/third_party/java/htmlunit/htmlunit-core-js-2.34.0-sources.jar b/third_party/java/htmlunit/htmlunit-core-js-2.34.0-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-core-js-2.34.0.jar b/third_party/java/htmlunit/htmlunit-core-js-2.34.0.jar
diff --git a/third_party/java/htmlunit/htmlunit-cssparser-1.2.0-sources.jar b/third_party/java/htmlunit/htmlunit-cssparser-1.2.0-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-cssparser-1.2.0.jar b/third_party/java/htmlunit/htmlunit-cssparser-1.2.0.jar
diff --git a/third_party/java/htmlunit/htmlunit-cssparser-1.3.0-sources.jar b/third_party/java/htmlunit/htmlunit-cssparser-1.3.0-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-cssparser-1.3.0.jar b/third_party/java/htmlunit/htmlunit-cssparser-1.3.0.jar
diff --git a/third_party/java/htmlunit/neko-htmlunit-2.33-sources.jar b/third_party/java/htmlunit/neko-htmlunit-2.33-sources.jar
diff --git a/third_party/java/htmlunit/neko-htmlunit-2.33.jar b/third_party/java/htmlunit/neko-htmlunit-2.33.jar
diff --git a/third_party/java/htmlunit/neko-htmlunit-2.34.0-sources.jar b/third_party/java/htmlunit/neko-htmlunit-2.34.0-sources.jar
diff --git a/third_party/java/htmlunit/neko-htmlunit-2.34.0.jar b/third_party/java/htmlunit/neko-htmlunit-2.34.0.jar
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.5",
-    binary_jar = "httpclient-4.5.5.jar",
-    source_jar = "httpclient-4.5.5-sources.jar",
+    maven_coords = "org.apache.httpcomponents:httpclient:jar:4.5.8",
+    binary_jar = "httpclient-4.5.8.jar",
+    source_jar = "httpclient-4.5.8-sources.jar",
     deps = [
         ":httpcore",
         "//third_party/java/commons-codec:commons-codec",
@@ -12,16 +12,16 @@ prebuilt_jar(
 
 prebuilt_jar(
     name = "httpcore",
-    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",
+    maven_coords = "org.apache.httpcomponents:httpcore:jar:4.4.11",
+    binary_jar = "httpcore-4.4.11.jar",
+    source_jar = "httpcore-4.4.11-sources.jar",
 )
 
 prebuilt_jar(
     name = "httpmime",
-    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",
+    maven_coords = "org.apache.httpcomponents:httpmime:jar:4.5.8",
+    binary_jar = "httpmime-4.5.8.jar",
+    source_jar = "httpmime-4.5.8-sources.jar",
     deps = [
         ":httpclient",
     ],

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/...tpcomponents/httpclient-4.5.5-sources.jar → ...tpcomponents/httpclient-4.5.8-sources.jar b/...tpcomponents/httpclient-4.5.5-sources.jar → ...tpcomponents/httpclient-4.5.8-sources.jar
diff --git a/third_party/java/httpcomponents/httpclient-4.5.8.jar b/third_party/java/httpcomponents/httpclient-4.5.8.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.11-sources.jar b/third_party/java/httpcomponents/httpcore-4.4.11-sources.jar
diff --git a/third_party/java/httpcomponents/httpcore-4.4.11.jar b/third_party/java/httpcomponents/httpcore-4.4.11.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/...httpcomponents/httpmime-4.5.5-sources.jar → ...httpcomponents/httpmime-4.5.8-sources.jar b/...httpcomponents/httpmime-4.5.5-sources.jar → ...httpcomponents/httpmime-4.5.8-sources.jar
diff --git a/...ty/java/httpcomponents/httpmime-4.5.5.jar → ...ty/java/httpcomponents/httpmime-4.5.8.jar b/...ty/java/httpcomponents/httpmime-4.5.5.jar → ...ty/java/httpcomponents/httpmime-4.5.8.jar