Skip to content

Commit b8d9d6d

Browse files
committed
[MAINTENANCE] Update eclipse asm and xbean in ejb-modeller-itests
1 parent a5c6a9e commit b8d9d6d

File tree

2 files changed

+34
-13
lines changed

2 files changed

+34
-13
lines changed

ejb/ejb-modeller-itest/pom.xml

+29-11
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<properties>
4343
<application-modeller-standalone.version>1.0.0</application-modeller-standalone.version>
44-
<asm-all.version>4.0</asm-all.version>
44+
<asm.version>9.7.1</asm.version>
4545
<commons-beanutils.version>1.8.3</commons-beanutils.version>
4646
<commons-cli.version>1.2</commons-cli.version>
4747
<commons-lang.version>2.6</commons-lang.version>
@@ -87,16 +87,16 @@
8787
<org.apache.servicemix.bundles.javassist.version>3.12.1.ga_1</org.apache.servicemix.bundles.javassist.version>
8888
<org.apache.servicemix.bundles.jaxb-impl.version>2.2.1.1_2</org.apache.servicemix.bundles.jaxb-impl.version>
8989
<org.apache.servicemix.bundles.wsdl4j-1.6.1.version>4.0-m1</org.apache.servicemix.bundles.wsdl4j-1.6.1.version>
90-
<org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
90+
<org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
9191
<scannotation.version>1.0.2_1</scannotation.version>
9292
<tinybundles.version>2.0.0</tinybundles.version>
9393
<url.version>2.5.3</url.version>
94-
<xbeansVersion>3.16</xbeansVersion>
94+
<xbeans.version>4.25</xbeans.version>
9595
</properties>
9696

9797
<dependencies>
9898
<dependency>
99-
<groupId>org.eclipse</groupId>
99+
<groupId>org.eclipse.platform</groupId>
100100
<artifactId>org.eclipse.osgi</artifactId>
101101
<version>${org.eclipse.osgi.version}</version>
102102
</dependency>
@@ -119,8 +119,26 @@
119119
</dependency>
120120
<dependency>
121121
<groupId>org.ow2.asm</groupId>
122-
<artifactId>asm-all</artifactId>
123-
<version>${asm-all.version}</version>
122+
<artifactId>asm</artifactId>
123+
<version>${asm.version}</version>
124+
<scope>test</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.ow2.asm</groupId>
128+
<artifactId>asm-commons</artifactId>
129+
<version>${asm.version}</version>
130+
<scope>test</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.ow2.asm</groupId>
134+
<artifactId>asm-tree</artifactId>
135+
<version>${asm.version}</version>
136+
<scope>test</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.ow2.asm</groupId>
140+
<artifactId>asm-analysis</artifactId>
141+
<version>${asm.version}</version>
124142
<scope>test</scope>
125143
</dependency>
126144
<dependency>
@@ -404,29 +422,29 @@
404422

405423
<dependency>
406424
<groupId>org.apache.xbean</groupId>
407-
<artifactId>xbean-asm-shaded</artifactId>
408-
<version>${xbeansVersion}</version>
425+
<artifactId>xbean-asm9-shaded</artifactId>
426+
<version>${xbeans.version}</version>
409427
<type>bundle</type>
410428
<scope>test</scope>
411429
</dependency>
412430
<dependency>
413431
<groupId>org.apache.xbean</groupId>
414432
<artifactId>xbean-finder-shaded</artifactId>
415-
<version>${xbeansVersion}</version>
433+
<version>${xbeans.version}</version>
416434
<type>bundle</type>
417435
<scope>test</scope>
418436
</dependency>
419437
<dependency>
420438
<groupId>org.apache.xbean</groupId>
421439
<artifactId>xbean-naming</artifactId>
422-
<version>${xbeansVersion}</version>
440+
<version>${xbeans.version}</version>
423441
<type>bundle</type>
424442
<scope>test</scope>
425443
</dependency>
426444
<dependency>
427445
<groupId>org.apache.xbean</groupId>
428446
<artifactId>xbean-reflect</artifactId>
429-
<version>${xbeansVersion}</version>
447+
<version>${xbeans.version}</version>
430448
<type>bundle</type>
431449
<scope>test</scope>
432450
</dependency>

ejb/ejb-modeller-itest/src/test/java/org/apache/aries/ejb/container/itest/EJBModellingTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ public Option[] configuration() {
108108
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
109109
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
110110
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
111-
mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
111+
mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
112+
mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
113+
mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
114+
mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
112115

113116
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
114117
mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(),
@@ -135,7 +138,7 @@ public Option[] configuration() {
135138
mavenBundle("org.apache.geronimo.components", "geronimo-connector").versionAsInProject(),
136139
mavenBundle("org.apache.geronimo.components", "geronimo-transaction").versionAsInProject(),
137140
mavenBundle("org.apache.geronimo.bundles", "scannotation").versionAsInProject(),
138-
mavenBundle("org.apache.xbean", "xbean-asm-shaded").versionAsInProject(),
141+
mavenBundle("org.apache.xbean", "xbean-asm9-shaded").versionAsInProject(),
139142
mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
140143
mavenBundle("org.apache.xbean", "xbean-naming").versionAsInProject(),
141144
mavenBundle("org.apache.xbean", "xbean-reflect").versionAsInProject(),

0 commit comments

Comments
 (0)