From 3640adcab3390e984ab30a6696e05b6f87bd07c8 Mon Sep 17 00:00:00 2001 From: Matt McCartney Date: Fri, 8 Dec 2023 15:46:47 -0800 Subject: [PATCH] chore(java): update-migrate htmlunit dependency (#13266) Updates the HtmlUnit Java dependency to the latest major release according to the migration guide: https://www.htmlunit.org/migration.html Resolves: vulnerability CVE-2023-26119 Related #13171 Co-authored-by: Diego Molina --- java/maven_deps.bzl | 2 +- java/maven_install.json | 70 +++++++++---------- .../org/openqa/selenium/atoms/BUILD.bazel | 2 +- .../atoms/CompiledAtomsNotLeakingTest.java | 6 +- .../openqa/selenium/atoms/InputAtomsTest.java | 8 +-- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/java/maven_deps.bzl b/java/maven_deps.bzl index 05f6c39c808c4..32e906a49694c 100644 --- a/java/maven_deps.bzl +++ b/java/maven_deps.bzl @@ -51,7 +51,7 @@ def selenium_java_deps(): "io.ous:jtoml:2.0.0", "it.ozimov:embedded-redis:0.7.3", "net.bytebuddy:byte-buddy:1.14.5", - "net.sourceforge.htmlunit:htmlunit-core-js:2.70.0", + "org.htmlunit:htmlunit-core-js:3.9.0", "org.apache.commons:commons-exec:1.3", "org.apache.logging.log4j:log4j-core:2.20.0", "org.assertj:assertj-core:3.24.2", diff --git a/java/maven_install.json b/java/maven_install.json index 10a99e1013579..67c411b1e94cc 100644 --- a/java/maven_install.json +++ b/java/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -500415533, - "__RESOLVED_ARTIFACTS_HASH": -758805856, + "__INPUT_ARTIFACTS_HASH": 1056130395, + "__RESOLVED_ARTIFACTS_HASH": 254042711, "artifacts": { "com.beust:jcommander": { "shasums": { @@ -493,13 +493,6 @@ }, "version": "11.4" }, - "net.sourceforge.htmlunit:htmlunit-core-js": { - "shasums": { - "jar": "7008cd93de74c8413b94ecf8b63fe642ee73168c5beba8c33b76ac80c4e4865c", - "sources": "8d9e41edaeac387cb6915078d74a53cdc86b9afca1ad08d13b83f3a051f57802" - }, - "version": "2.70.0" - }, "org.apache.bcel:bcel": { "shasums": { "jar": "bdeb381d0d19999e221e6a0f8d8bf44f5b19c2e57eabf68b70dc098652aefaf5", @@ -626,6 +619,13 @@ }, "version": "2.7.2" }, + "org.htmlunit:htmlunit-core-js": { + "shasums": { + "jar": "8e67c1435dac87884300dfe91e7c4900275c4328ac9432d4aec955e3f2f3ab16", + "sources": "e381737dcd02d18300bb62d64350960dd6ebdeeed032d119bb1d258d49718e5c" + }, + "version": "3.9.0" + }, "org.jboss.marshalling:jboss-marshalling": { "shasums": { "jar": "93d6257e1ac0f93ba6ff85827c9ef65b5efabf7bd2241fb3b4caf6c426f4f149", @@ -1955,28 +1955,6 @@ "net.sf.saxon.xpath", "net.sf.saxon.z" ], - "net.sourceforge.htmlunit:htmlunit-core-js": [ - "net.sourceforge.htmlunit.corejs.classfile", - "net.sourceforge.htmlunit.corejs.javascript", - "net.sourceforge.htmlunit.corejs.javascript.annotations", - "net.sourceforge.htmlunit.corejs.javascript.ast", - "net.sourceforge.htmlunit.corejs.javascript.commonjs.module", - "net.sourceforge.htmlunit.corejs.javascript.commonjs.module.provider", - "net.sourceforge.htmlunit.corejs.javascript.debug", - "net.sourceforge.htmlunit.corejs.javascript.engine", - "net.sourceforge.htmlunit.corejs.javascript.jdk18", - "net.sourceforge.htmlunit.corejs.javascript.json", - "net.sourceforge.htmlunit.corejs.javascript.optimizer", - "net.sourceforge.htmlunit.corejs.javascript.regexp", - "net.sourceforge.htmlunit.corejs.javascript.serialize", - "net.sourceforge.htmlunit.corejs.javascript.tools", - "net.sourceforge.htmlunit.corejs.javascript.tools.debugger", - "net.sourceforge.htmlunit.corejs.javascript.tools.debugger.treetable", - "net.sourceforge.htmlunit.corejs.javascript.tools.shell", - "net.sourceforge.htmlunit.corejs.javascript.typedarrays", - "net.sourceforge.htmlunit.corejs.javascript.v8dtoa", - "net.sourceforge.htmlunit.corejs.javascript.xml" - ], "org.apache.bcel:bcel": [ "org.apache.bcel", "org.apache.bcel.classfile", @@ -2542,6 +2520,28 @@ "org.hsqldb.types", "org.hsqldb.util" ], + "org.htmlunit:htmlunit-core-js": [ + "org.htmlunit.corejs.classfile", + "org.htmlunit.corejs.javascript", + "org.htmlunit.corejs.javascript.annotations", + "org.htmlunit.corejs.javascript.ast", + "org.htmlunit.corejs.javascript.commonjs.module", + "org.htmlunit.corejs.javascript.commonjs.module.provider", + "org.htmlunit.corejs.javascript.debug", + "org.htmlunit.corejs.javascript.engine", + "org.htmlunit.corejs.javascript.jdk18", + "org.htmlunit.corejs.javascript.json", + "org.htmlunit.corejs.javascript.optimizer", + "org.htmlunit.corejs.javascript.regexp", + "org.htmlunit.corejs.javascript.serialize", + "org.htmlunit.corejs.javascript.tools", + "org.htmlunit.corejs.javascript.tools.debugger", + "org.htmlunit.corejs.javascript.tools.debugger.treetable", + "org.htmlunit.corejs.javascript.tools.shell", + "org.htmlunit.corejs.javascript.typedarrays", + "org.htmlunit.corejs.javascript.v8dtoa", + "org.htmlunit.corejs.javascript.xml" + ], "org.jboss.marshalling:jboss-marshalling": [ "org.jboss.marshalling", "org.jboss.marshalling._private", @@ -3083,8 +3083,6 @@ "net.jcip:jcip-annotations:jar:sources", "net.sf.saxon:Saxon-HE", "net.sf.saxon:Saxon-HE:jar:sources", - "net.sourceforge.htmlunit:htmlunit-core-js", - "net.sourceforge.htmlunit:htmlunit-core-js:jar:sources", "org.apache.bcel:bcel", "org.apache.bcel:bcel:jar:sources", "org.apache.commons:commons-exec", @@ -3121,6 +3119,8 @@ "org.eclipse.mylyn.github:org.eclipse.egit.github.core:jar:sources", "org.hsqldb:hsqldb", "org.hsqldb:hsqldb:jar:sources", + "org.htmlunit:htmlunit-core-js", + "org.htmlunit:htmlunit-core-js:jar:sources", "org.jboss.marshalling:jboss-marshalling", "org.jboss.marshalling:jboss-marshalling-river", "org.jboss.marshalling:jboss-marshalling-river:jar:sources", @@ -3321,8 +3321,6 @@ "net.jcip:jcip-annotations:jar:sources", "net.sf.saxon:Saxon-HE", "net.sf.saxon:Saxon-HE:jar:sources", - "net.sourceforge.htmlunit:htmlunit-core-js", - "net.sourceforge.htmlunit:htmlunit-core-js:jar:sources", "org.apache.bcel:bcel", "org.apache.bcel:bcel:jar:sources", "org.apache.commons:commons-exec", @@ -3359,6 +3357,8 @@ "org.eclipse.mylyn.github:org.eclipse.egit.github.core:jar:sources", "org.hsqldb:hsqldb", "org.hsqldb:hsqldb:jar:sources", + "org.htmlunit:htmlunit-core-js", + "org.htmlunit:htmlunit-core-js:jar:sources", "org.jboss.marshalling:jboss-marshalling", "org.jboss.marshalling:jboss-marshalling-river", "org.jboss.marshalling:jboss-marshalling-river:jar:sources", diff --git a/java/test/org/openqa/selenium/atoms/BUILD.bazel b/java/test/org/openqa/selenium/atoms/BUILD.bazel index 1035c3dba9b8f..abe8590f06ed1 100644 --- a/java/test/org/openqa/selenium/atoms/BUILD.bazel +++ b/java/test/org/openqa/selenium/atoms/BUILD.bazel @@ -38,7 +38,7 @@ java_test_suite( "//java/test/org/openqa/selenium:helpers", "//java/test/org/openqa/selenium/build", artifact("org.assertj:assertj-core"), - artifact("net.sourceforge.htmlunit:htmlunit-core-js"), + artifact("org.htmlunit:htmlunit-core-js"), artifact("org.junit.jupiter:junit-jupiter-api"), ] + JUNIT5_DEPS, ) diff --git a/java/test/org/openqa/selenium/atoms/CompiledAtomsNotLeakingTest.java b/java/test/org/openqa/selenium/atoms/CompiledAtomsNotLeakingTest.java index 0544f67506b65..63396dea4253a 100644 --- a/java/test/org/openqa/selenium/atoms/CompiledAtomsNotLeakingTest.java +++ b/java/test/org/openqa/selenium/atoms/CompiledAtomsNotLeakingTest.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.Map; -import net.sourceforge.htmlunit.corejs.javascript.Context; -import net.sourceforge.htmlunit.corejs.javascript.ContextFactory; -import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject; +import org.htmlunit.corejs.javascript.Context; +import org.htmlunit.corejs.javascript.ContextFactory; +import org.htmlunit.corejs.javascript.ScriptableObject; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/java/test/org/openqa/selenium/atoms/InputAtomsTest.java b/java/test/org/openqa/selenium/atoms/InputAtomsTest.java index 2cf5c44e439e0..62b35a3d8e373 100644 --- a/java/test/org/openqa/selenium/atoms/InputAtomsTest.java +++ b/java/test/org/openqa/selenium/atoms/InputAtomsTest.java @@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import net.sourceforge.htmlunit.corejs.javascript.Context; -import net.sourceforge.htmlunit.corejs.javascript.ContextAction; -import net.sourceforge.htmlunit.corejs.javascript.ContextFactory; -import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject; +import org.htmlunit.corejs.javascript.Context; +import org.htmlunit.corejs.javascript.ContextAction; +import org.htmlunit.corejs.javascript.ContextFactory; +import org.htmlunit.corejs.javascript.ScriptableObject; import org.junit.jupiter.api.Test; /** Sanity tests against the //javascript/webdriver/atoms:inputs target. */