From c0262d14e7eed30d53b6bab77b077a028609e16e Mon Sep 17 00:00:00 2001
From: Scott Babcock <scoba@hotmail.com>
Date: Sun, 15 Aug 2021 14:25:53 -0700
Subject: [PATCH] Upgrade to 'htmlunit-driver' 2.52.0 (#169)

---
 build.gradle                                             | 2 +-
 pom.xml                                                  | 9 ++-------
 selenium3Deps.gradle                                     | 3 +--
 .../automation/selenium/plugins/HtmlUnitPlugin.java      | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7763ec30..dfc4793f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -295,7 +295,7 @@ dependencies {
   compile 'org.jsoup:jsoup:1.12.1'
   compile('org.hamcrest:hamcrest-core:2.2') { force = true }
   compile('org.yaml:snakeyaml:1.28') { force = true }
-  compile('org.eclipse.jetty.websocket:websocket-client:9.4.42.v20210604') { force = true }
+  compile('org.eclipse.jetty.websocket:websocket-client:9.4.43.v20210629') { force = true }
   
   apply from: "${profile}Deps.gradle"
   
diff --git a/pom.xml b/pom.xml
index d06f3136..2e3f17be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
     <!-- managed to resolve identified threat -->
     <snakeyaml.version>1.28</snakeyaml.version>
     <!-- managed to resolve identified threat -->
-    <websocket-client.version>9.4.42.v20210604</websocket-client.version>
+    <websocket-client.version>9.4.43.v20210629</websocket-client.version>
   </properties>
   
   <scm>
@@ -309,7 +309,7 @@
         <testng-foundation.version>3.0.1-j8</testng-foundation.version>
         <selenium.version>3.141.59</selenium.version>
         <guava.version>30.1.1-jre</guava.version>
-        <htmlunit.version>2.51.0</htmlunit.version>
+        <htmlunit.version>2.52.0</htmlunit.version>
         <jcommander.version>1.78</jcommander.version>
         <mockito.version>3.1.0</mockito.version>
         <!-- managed to resolve identified threat -->
@@ -342,11 +342,6 @@
             <artifactId>selenium-server</artifactId>
             <version>${selenium.version}</version>
           </dependency>
-          <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>${htmlunit.version}</version>
-          </dependency>
           <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>htmlunit-driver</artifactId>
diff --git a/selenium3Deps.gradle b/selenium3Deps.gradle
index 7bd8c539..59b96b09 100644
--- a/selenium3Deps.gradle
+++ b/selenium3Deps.gradle
@@ -22,8 +22,7 @@ dependencies {
     exclude module: 'htmlunit-driver'
     exclude group: 'net.sourceforge.htmlunit', module: 'htmlunit'
   }
-  selenium3Compile('net.sourceforge.htmlunit:htmlunit:2.51.0') { force = true }
-  selenium3Compile 'org.seleniumhq.selenium:htmlunit-driver:2.51.0'
+  selenium3Compile 'org.seleniumhq.selenium:htmlunit-driver:2.52.0'
   selenium3Compile('com.squareup.okhttp3:okhttp:4.9.1') { force = true }
   selenium3Compile('com.squareup.okio:okio:2.8.0') { force = true }
   testCompile 'org.mockito:mockito-core:3.1.0'
diff --git a/src/main/java-s3/com/nordstrom/automation/selenium/plugins/HtmlUnitPlugin.java b/src/main/java-s3/com/nordstrom/automation/selenium/plugins/HtmlUnitPlugin.java
index 6b95fa5c..b3e5d29d 100644
--- a/src/main/java-s3/com/nordstrom/automation/selenium/plugins/HtmlUnitPlugin.java
+++ b/src/main/java-s3/com/nordstrom/automation/selenium/plugins/HtmlUnitPlugin.java
@@ -23,7 +23,7 @@ public HtmlUnitPlugin() {
      * <pre>&lt;dependency&gt;
      *  &lt;groupId&gt;org.seleniumhq.selenium&lt;/groupId&gt;
      *  &lt;artifactId&gt;htmlunit-driver&lt;/artifactId&gt;
-     *  &lt;version&gt;2.40.0&lt;/version&gt;
+     *  &lt;version&gt;2.52.0&lt;/version&gt;
      *&lt;/dependency&gt;</pre>
      */
     private static final String[] DEPENDENCY_CONTEXTS = {
@@ -41,7 +41,7 @@ public HtmlUnitPlugin() {
                     "org.eclipse.jetty.websocket.api.Session",
                     "net.sourceforge.htmlunit.corejs.javascript.Token",
                     "net.sourceforge.htmlunit.cyberneko.filters.DefaultFilter",
-                    "org.apache.xmlcommons.Version", "com.gargoylesoftware.css.parser.CSSParser",
+                    "org.apache.xmlcommons.Version", "com.gargoylesoftware.css.util.LangUtils",
                     "org.apache.commons.net.io.Util", "org.eclipse.jetty.client.Origin",
                     "org.eclipse.jetty.http.Syntax", "org.brotli.dec.Utils"};