[MAINTENANCE] Update eclipse asm and xbean in ejb-modeller-itests

apache · Jan 25, 2025 · b8d9d6d · b8d9d6d
1 parent a5c6a9e
commit b8d9d6d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml
@@ -41,7 +41,7 @@
 
     <properties>
         <application-modeller-standalone.version>1.0.0</application-modeller-standalone.version>
-        <asm-all.version>4.0</asm-all.version>
+        <asm.version>9.7.1</asm.version>
         <commons-beanutils.version>1.8.3</commons-beanutils.version>
         <commons-cli.version>1.2</commons-cli.version>
         <commons-lang.version>2.6</commons-lang.version>
@@ -87,16 +87,16 @@
         <org.apache.servicemix.bundles.javassist.version>3.12.1.ga_1</org.apache.servicemix.bundles.javassist.version>
         <org.apache.servicemix.bundles.jaxb-impl.version>2.2.1.1_2</org.apache.servicemix.bundles.jaxb-impl.version>
         <org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version>
-        <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
+        <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
         <scannotation.version>1.0.2_1</scannotation.version>
         <tinybundles.version>2.0.0</tinybundles.version>
         <url.version>2.5.3</url.version>
-        <xbeansVersion>3.16</xbeansVersion>
+        <xbeans.version>4.25</xbeans.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
             <version>${org.eclipse.osgi.version}</version>
         </dependency>
@@ -119,8 +119,26 @@
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>${asm-all.version}</version>
+            <artifactId>asm</artifactId>
+            <version>${asm.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+            <version>${asm.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-analysis</artifactId>
+            <version>${asm.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -404,29 +422,29 @@
 
         <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm-shaded</artifactId>
-            <version>${xbeansVersion}</version>
+            <artifactId>xbean-asm9-shaded</artifactId>
+            <version>${xbeans.version}</version>
             <type>bundle</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder-shaded</artifactId>
-            <version>${xbeansVersion}</version>
+            <version>${xbeans.version}</version>
             <type>bundle</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-naming</artifactId>
-            <version>${xbeansVersion}</version>
+            <version>${xbeans.version}</version>
             <type>bundle</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-reflect</artifactId>
-            <version>${xbeansVersion}</version>
+            <version>${xbeans.version}</version>
             <type>bundle</type>
             <scope>test</scope>
         </dependency>

diff --git a/...b-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java b/...b-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java
@@ -108,7 +108,10 @@ public Option[] configuration() {
 				mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
 				mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
 				mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
-				mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+				mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+				mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+				mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+				mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
 
 				mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
 				mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(),
@@ -135,7 +138,7 @@ public Option[] configuration() {
 				mavenBundle("org.apache.geronimo.components", "geronimo-connector").versionAsInProject(),
 				mavenBundle("org.apache.geronimo.components", "geronimo-transaction").versionAsInProject(),
 				mavenBundle("org.apache.geronimo.bundles", "scannotation").versionAsInProject(),
-				mavenBundle("org.apache.xbean", "xbean-asm-shaded").versionAsInProject(),
+				mavenBundle("org.apache.xbean", "xbean-asm9-shaded").versionAsInProject(),
 				mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
 				mavenBundle("org.apache.xbean", "xbean-naming").versionAsInProject(),
 				mavenBundle("org.apache.xbean", "xbean-reflect").versionAsInProject(),