Skip to content

Commit 3640adc

Browse files
mmccartndiemol
mmccartn
and
diemol
authored
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 <diemol@users.noreply.github.com>
1 parent 259a94d commit 3640adc

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎java/maven_deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def selenium_java_deps():
5151
"io.ous:jtoml:2.0.0",
5252
"it.ozimov:embedded-redis:0.7.3",
5353
"net.bytebuddy:byte-buddy:1.14.5",
54-
"net.sourceforge.htmlunit:htmlunit-core-js:2.70.0",
54+
"org.htmlunit:htmlunit-core-js:3.9.0",
5555
"org.apache.commons:commons-exec:1.3",
5656
"org.apache.logging.log4j:log4j-core:2.20.0",
5757
"org.assertj:assertj-core:3.24.2",

‎java/maven_install.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -500415533,
4-
"__RESOLVED_ARTIFACTS_HASH": -758805856,
3+
"__INPUT_ARTIFACTS_HASH": 1056130395,
4+
"__RESOLVED_ARTIFACTS_HASH": 254042711,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -493,13 +493,6 @@
493493
},
494494
"version": "11.4"
495495
},
496-
"net.sourceforge.htmlunit:htmlunit-core-js": {
497-
"shasums": {
498-
"jar": "7008cd93de74c8413b94ecf8b63fe642ee73168c5beba8c33b76ac80c4e4865c",
499-
"sources": "8d9e41edaeac387cb6915078d74a53cdc86b9afca1ad08d13b83f3a051f57802"
500-
},
501-
"version": "2.70.0"
502-
},
503496
"org.apache.bcel:bcel": {
504497
"shasums": {
505498
"jar": "bdeb381d0d19999e221e6a0f8d8bf44f5b19c2e57eabf68b70dc098652aefaf5",
@@ -626,6 +619,13 @@
626619
},
627620
"version": "2.7.2"
628621
},
622+
"org.htmlunit:htmlunit-core-js": {
623+
"shasums": {
624+
"jar": "8e67c1435dac87884300dfe91e7c4900275c4328ac9432d4aec955e3f2f3ab16",
625+
"sources": "e381737dcd02d18300bb62d64350960dd6ebdeeed032d119bb1d258d49718e5c"
626+
},
627+
"version": "3.9.0"
628+
},
629629
"org.jboss.marshalling:jboss-marshalling": {
630630
"shasums": {
631631
"jar": "93d6257e1ac0f93ba6ff85827c9ef65b5efabf7bd2241fb3b4caf6c426f4f149",
@@ -1955,28 +1955,6 @@
19551955
"net.sf.saxon.xpath",
19561956
"net.sf.saxon.z"
19571957
],
1958-
"net.sourceforge.htmlunit:htmlunit-core-js": [
1959-
"net.sourceforge.htmlunit.corejs.classfile",
1960-
"net.sourceforge.htmlunit.corejs.javascript",
1961-
"net.sourceforge.htmlunit.corejs.javascript.annotations",
1962-
"net.sourceforge.htmlunit.corejs.javascript.ast",
1963-
"net.sourceforge.htmlunit.corejs.javascript.commonjs.module",
1964-
"net.sourceforge.htmlunit.corejs.javascript.commonjs.module.provider",
1965-
"net.sourceforge.htmlunit.corejs.javascript.debug",
1966-
"net.sourceforge.htmlunit.corejs.javascript.engine",
1967-
"net.sourceforge.htmlunit.corejs.javascript.jdk18",
1968-
"net.sourceforge.htmlunit.corejs.javascript.json",
1969-
"net.sourceforge.htmlunit.corejs.javascript.optimizer",
1970-
"net.sourceforge.htmlunit.corejs.javascript.regexp",
1971-
"net.sourceforge.htmlunit.corejs.javascript.serialize",
1972-
"net.sourceforge.htmlunit.corejs.javascript.tools",
1973-
"net.sourceforge.htmlunit.corejs.javascript.tools.debugger",
1974-
"net.sourceforge.htmlunit.corejs.javascript.tools.debugger.treetable",
1975-
"net.sourceforge.htmlunit.corejs.javascript.tools.shell",
1976-
"net.sourceforge.htmlunit.corejs.javascript.typedarrays",
1977-
"net.sourceforge.htmlunit.corejs.javascript.v8dtoa",
1978-
"net.sourceforge.htmlunit.corejs.javascript.xml"
1979-
],
19801958
"org.apache.bcel:bcel": [
19811959
"org.apache.bcel",
19821960
"org.apache.bcel.classfile",
@@ -2542,6 +2520,28 @@
25422520
"org.hsqldb.types",
25432521
"org.hsqldb.util"
25442522
],
2523+
"org.htmlunit:htmlunit-core-js": [
2524+
"org.htmlunit.corejs.classfile",
2525+
"org.htmlunit.corejs.javascript",
2526+
"org.htmlunit.corejs.javascript.annotations",
2527+
"org.htmlunit.corejs.javascript.ast",
2528+
"org.htmlunit.corejs.javascript.commonjs.module",
2529+
"org.htmlunit.corejs.javascript.commonjs.module.provider",
2530+
"org.htmlunit.corejs.javascript.debug",
2531+
"org.htmlunit.corejs.javascript.engine",
2532+
"org.htmlunit.corejs.javascript.jdk18",
2533+
"org.htmlunit.corejs.javascript.json",
2534+
"org.htmlunit.corejs.javascript.optimizer",
2535+
"org.htmlunit.corejs.javascript.regexp",
2536+
"org.htmlunit.corejs.javascript.serialize",
2537+
"org.htmlunit.corejs.javascript.tools",
2538+
"org.htmlunit.corejs.javascript.tools.debugger",
2539+
"org.htmlunit.corejs.javascript.tools.debugger.treetable",
2540+
"org.htmlunit.corejs.javascript.tools.shell",
2541+
"org.htmlunit.corejs.javascript.typedarrays",
2542+
"org.htmlunit.corejs.javascript.v8dtoa",
2543+
"org.htmlunit.corejs.javascript.xml"
2544+
],
25452545
"org.jboss.marshalling:jboss-marshalling": [
25462546
"org.jboss.marshalling",
25472547
"org.jboss.marshalling._private",
@@ -3083,8 +3083,6 @@
30833083
"net.jcip:jcip-annotations:jar:sources",
30843084
"net.sf.saxon:Saxon-HE",
30853085
"net.sf.saxon:Saxon-HE:jar:sources",
3086-
"net.sourceforge.htmlunit:htmlunit-core-js",
3087-
"net.sourceforge.htmlunit:htmlunit-core-js:jar:sources",
30883086
"org.apache.bcel:bcel",
30893087
"org.apache.bcel:bcel:jar:sources",
30903088
"org.apache.commons:commons-exec",
@@ -3121,6 +3119,8 @@
31213119
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:jar:sources",
31223120
"org.hsqldb:hsqldb",
31233121
"org.hsqldb:hsqldb:jar:sources",
3122+
"org.htmlunit:htmlunit-core-js",
3123+
"org.htmlunit:htmlunit-core-js:jar:sources",
31243124
"org.jboss.marshalling:jboss-marshalling",
31253125
"org.jboss.marshalling:jboss-marshalling-river",
31263126
"org.jboss.marshalling:jboss-marshalling-river:jar:sources",
@@ -3321,8 +3321,6 @@
33213321
"net.jcip:jcip-annotations:jar:sources",
33223322
"net.sf.saxon:Saxon-HE",
33233323
"net.sf.saxon:Saxon-HE:jar:sources",
3324-
"net.sourceforge.htmlunit:htmlunit-core-js",
3325-
"net.sourceforge.htmlunit:htmlunit-core-js:jar:sources",
33263324
"org.apache.bcel:bcel",
33273325
"org.apache.bcel:bcel:jar:sources",
33283326
"org.apache.commons:commons-exec",
@@ -3359,6 +3357,8 @@
33593357
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:jar:sources",
33603358
"org.hsqldb:hsqldb",
33613359
"org.hsqldb:hsqldb:jar:sources",
3360+
"org.htmlunit:htmlunit-core-js",
3361+
"org.htmlunit:htmlunit-core-js:jar:sources",
33623362
"org.jboss.marshalling:jboss-marshalling",
33633363
"org.jboss.marshalling:jboss-marshalling-river",
33643364
"org.jboss.marshalling:jboss-marshalling-river:jar:sources",

‎java/test/org/openqa/selenium/atoms/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ java_test_suite(
3838
"//java/test/org/openqa/selenium:helpers",
3939
"//java/test/org/openqa/selenium/build",
4040
artifact("org.assertj:assertj-core"),
41-
artifact("net.sourceforge.htmlunit:htmlunit-core-js"),
41+
artifact("org.htmlunit:htmlunit-core-js"),
4242
artifact("org.junit.jupiter:junit-jupiter-api"),
4343
] + JUNIT5_DEPS,
4444
)

‎java/test/org/openqa/selenium/atoms/CompiledAtomsNotLeakingTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import java.io.IOException;
2424
import java.util.Map;
25-
import net.sourceforge.htmlunit.corejs.javascript.Context;
26-
import net.sourceforge.htmlunit.corejs.javascript.ContextFactory;
27-
import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
25+
import org.htmlunit.corejs.javascript.Context;
26+
import org.htmlunit.corejs.javascript.ContextFactory;
27+
import org.htmlunit.corejs.javascript.ScriptableObject;
2828
import org.junit.jupiter.api.BeforeAll;
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;

‎java/test/org/openqa/selenium/atoms/InputAtomsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import static org.assertj.core.api.Assertions.assertThat;
2121

2222
import java.io.IOException;
23-
import net.sourceforge.htmlunit.corejs.javascript.Context;
24-
import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
25-
import net.sourceforge.htmlunit.corejs.javascript.ContextFactory;
26-
import net.sourceforge.htmlunit.corejs.javascript.ScriptableObject;
23+
import org.htmlunit.corejs.javascript.Context;
24+
import org.htmlunit.corejs.javascript.ContextAction;
25+
import org.htmlunit.corejs.javascript.ContextFactory;
26+
import org.htmlunit.corejs.javascript.ScriptableObject;
2727
import org.junit.jupiter.api.Test;
2828

2929
/** Sanity tests against the //javascript/webdriver/atoms:inputs target. */

0 commit comments

Comments
 (0)