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] 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 451f7786e..8aed31c0b 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 e006c2365..615d67bd3 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>