Merge pull request #767 from apache/fix-conflict-deps

Fix conflicting dependencies
apache · Oct 15, 2023 · 43fb80e · 43fb80e
2 parents 67da669 + a750917
commit 43fb80e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git 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
@@ -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/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
@@ -109,8 +109,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- dependency versions in alphanumeric order -->
-        <asm.version>9.5</asm.version>
-        <jackson.version>2.15.2</jackson.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>
         <slf4j.version>2.0.7</slf4j.version>
@@ -765,6 +765,10 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>asm</groupId>
+                        <artifactId>asm</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -968,6 +972,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>
@@ -1102,14 +1113,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>