This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new b8d9d6da6 [MAINTENANCE] Update eclipse asm and xbean in
ejb-modeller-itests
b8d9d6da6 is described below
commit b8d9d6da6840348e0daf90ded15ea3e3ec064fc1
Author: Dominik Przybysz <[email protected]>
AuthorDate: Sat Jan 25 19:53:08 2025 +0100
[MAINTENANCE] Update eclipse asm and xbean in ejb-modeller-itests
---
ejb/ejb-modeller-itest/pom.xml | 40 ++++++++++++++++------
.../ejb/container/itest/EJBModellingTest.java | 7 ++--
2 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml
index 8fd37be3d..701963d9e 100644
--- 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/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java
b/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java
index 755ec942d..1d887d768 100644
---
a/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java
+++
b/ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java
@@ -108,7 +108,10 @@ public class EJBModellingTest extends
AbstractEJBModellerTest {
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 class EJBModellingTest extends
AbstractEJBModellerTest {
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(),
