From 39f81575f9c18784d0ae90edb6daed45b6a0fb84 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Sun, 15 Oct 2023 13:48:23 +1100
Subject: [PATCH 1/3] Upgrade Jackson and remove unnecessary transitive
 override

---
 pom.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0a5aed20e..7865fb7af8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
 
         <!-- dependency versions in alphanumeric order -->
         <asm.version>9.5</asm.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.15.3</jackson.version>
         <log4j2.version>2.20.0</log4j2.version>
         <ognl.version>3.3.4</ognl.version>
         <slf4j.version>2.0.7</slf4j.version>
@@ -1102,14 +1102,6 @@
                 <version>${jackson.version}</version>
             </dependency>
 
-            <!-- FIXME: Workaround for jackson-dataformat-xml issue #340 of forgetting to update stax2-api  -->
-            <!-- https://github.com/FasterXML/jackson-dataformat-xml/issues/340 -->
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>stax2-api</artifactId>
-                <version>4.2.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.juneau</groupId>
                 <artifactId>juneau-marshall</artifactId>

From 403c3c4a10b270e97090dbb113ff146c3d200855 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Sun, 15 Oct 2023 23:37:13 +1100
Subject: [PATCH 2/3] Unify HtmlUnit versions

---
 apps/rest-showcase/pom.xml | 1 -
 apps/showcase/pom.xml      | 1 -
 pom.xml                    | 7 +++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index e891f704de..7c6f16051c 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -78,7 +78,6 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.39.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 87b524ac14..263c029f83 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -140,7 +140,6 @@
        <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.61.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 7865fb7af8..e006c2365b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -968,6 +968,13 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>net.sourceforge.htmlunit</groupId>
+                <artifactId>htmlunit</artifactId>
+                <version>2.70.0</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>jmock</groupId>
                 <artifactId>jmock</artifactId>

From a750917fb42604bca903983a7d4477bdf39fa2b7 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Sun, 15 Oct 2023 23:37:36 +1100
Subject: [PATCH 3/3] Upgrade ASM and exclude conflicting artifact

---
 plugins/portlet/pom.xml | 9 ---------
 pom.xml                 | 6 +++++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 451f7786e1..8aed31c0b0 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -80,15 +80,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <!-- Requires ASM 3.3.1 for testing, as jmock-cglib apparently overrides a method made final in later ASM versions
-                 (and apparently jmock-cglib still requires ASM, despite no visible tree dependency). -->
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>3.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
diff --git a/pom.xml b/pom.xml
index e006c2365b..615d67bd39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- dependency versions in alphanumeric order -->
-        <asm.version>9.5</asm.version>
+        <asm.version>9.6</asm.version>
         <jackson.version>2.15.3</jackson.version>
         <log4j2.version>2.20.0</log4j2.version>
         <ognl.version>3.3.4</ognl.version>
@@ -765,6 +765,10 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>asm</groupId>
+                        <artifactId>asm</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>