[MAINTENANCE] Update asm and pax-url in web

apache · Feb 14, 2025 · cf104eb · cf104eb
1 parent 929fc67
commit cf104eb
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 9 deletions.
diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <asm.version>5.0.3</asm.version>
+        <asm.version>9.7.1</asm.version>
         <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
         <exam.version>4.13.5</exam.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
@@ -50,7 +50,7 @@
         <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
         <tinybundles.version>2.1.1</tinybundles.version>
-        <url.version>2.5.3</url.version>
+        <url.version>2.6.16</url.version>
     </properties>
 
     <dependencies>
@@ -61,7 +61,22 @@
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-debug-all</artifactId>
+            <artifactId>asm</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-analysis</artifactId>
             <version>${asm.version}</version>
         </dependency>
         <dependency>

diff --git a/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java b/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
@@ -126,7 +126,10 @@ public Option[] configuration() {
 				// Bundles
 				mavenBundle("org.apache.aries.web", "org.apache.aries.web.urlhandler"),
 				mavenBundle("org.apache.aries", "org.apache.aries.util"),
-				mavenBundle("org.ow2.asm", "asm-debug-all"),
+				mavenBundle("org.ow2.asm", "asm"),
+				mavenBundle("org.ow2.asm", "asm-commons"),
+				mavenBundle("org.ow2.asm", "asm-tree"),
+				mavenBundle("org.ow2.asm", "asm-analysis"),
 				mavenBundle("org.apache.aries.testsupport",	"org.apache.aries.testsupport.unit"));
 	}
 

diff --git a/web/web-urlhandler/pom.xml b/web/web-urlhandler/pom.xml
@@ -49,10 +49,14 @@
             org.apache.aries.web.converter.impl,
             org.apache.aries.web.url
         </aries.osgi.private.pkg>
+        <aries.osgi.import>
+            org.objectweb.asm*;version="[9,10)",
+            *
+        </aries.osgi.import>
         <aries.osgi.activator>org.apache.aries.web.converter.impl.Activator</aries.osgi.activator>
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
 
-        <asm.version>5.0.3</asm.version>
+        <asm.version>9.7.1</asm.version>
     </properties>
 
     <dependencies>
@@ -62,15 +66,30 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>provided</scope>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-debug-all</artifactId>
+            <artifactId>asm-tree</artifactId>
             <version>${asm.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-analysis</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>