[PAXCDI-234] Upgrade to XBean 4.12 (ASM7)

ops4j · Jan 15, 2019 · 075eb7a · 075eb7a
1 parent 619df54
commit 075eb7a
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 41 deletions.
diff --git a/itest/src/it/itest-karaf/pom.xml b/itest/src/it/itest-karaf/pom.xml
@@ -234,8 +234,6 @@
             <scope>provided</scope>
         </dependency>
 
-
-
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>standard</artifactId>
@@ -269,7 +267,6 @@
                 <configuration>
                     <systemPropertyVariables>
                         <ProjectVersion>${project.version}</ProjectVersion>
-
                         <pax.cdi.provider>${pax.cdi.provider}</pax.cdi.provider>
                         <pax.exam.karaf.version>${karaf.version}</pax.exam.karaf.version>
                         <localRepository>${settings.localRepository}</localRepository>
@@ -364,7 +361,7 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.xbean</groupId>
-                    <artifactId>xbean-asm5-shaded</artifactId>
+                    <artifactId>xbean-asm7-shaded</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

diff --git a/itest/src/it/itest-standalone/pom.xml b/itest/src/it/itest-standalone/pom.xml
@@ -97,6 +97,11 @@
             <artifactId>xbean-finder-shaded</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-asm7-shaded</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.cdi</groupId>

diff --git a/.../src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/ComponentLifecycleTest.java b/.../src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/ComponentLifecycleTest.java
@@ -62,8 +62,7 @@ public Option[] config() {
                 workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample1"),
                 workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample1-client"),
 
-                paxCdiProviderAdapter(),
-                cdiProviderBundles()
+                paxCdiProviderAdapter()
         );
     }
 

diff --git a/...t/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/NoWabWebContainerTest.java b/...t/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/NoWabWebContainerTest.java
@@ -67,7 +67,6 @@ public Option[] config() {
 
                 paxCdiProviderAdapter(),
                 paxCdiProviderJettyAdapter(),
-                cdiProviderBundles(),
 
                 propagateSystemProperty("org.osgi.service.http.port"),
                 paxWebBundles(),

diff --git a/itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/TransactionalTest.java b/itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/TransactionalTest.java
@@ -72,9 +72,9 @@ public Option[] config() {
                         "3.3_2"),
                 mavenBundle("javax.servlet", "javax.servlet-api").versionAsInProject(),
                 mavenBundle("org.apache.openjpa", "openjpa").versionAsInProject(),
-                mavenBundle("org.apache.xbean", "xbean-bundleutils").version("4.4"),
-                mavenBundle("org.apache.xbean", "xbean-finder-shaded").version("4.4"),
-                mavenBundle("org.apache.xbean", "xbean-asm5-shaded").version("4.4"),
+                mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(),
+                mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
+                mavenBundle("org.apache.xbean", "xbean-asm7-shaded").versionAsInProject(),
 
                 // Pax JPA, Pax JDBC and Derby driver
                 mavenBundle("org.ops4j.pax.jpa", "pax-jpa").versionAsInProject().startLevel(2),

diff --git a/.../it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/WebBeanBundleLifecycleTest.java b/.../it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/WebBeanBundleLifecycleTest.java
@@ -66,7 +66,6 @@ public Option[] config() {
                 workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample1"),
                 mavenBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample1-web", Info.getPaxCdiVersion()),
 
-                cdiProviderBundles(),
                 paxCdiProviderAdapter(),
                 paxCdiProviderJettyAdapter(),
 

diff --git a/pax-cdi-features/src/main/resources/features.xml b/pax-cdi-features/src/main/resources/features.xml
@@ -44,7 +44,7 @@
         <feature version="${project.version}">pax-cdi</feature>
         <feature version="${project.version}">pax-cdi-core</feature>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-bundleutils/${xbean.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm6-shaded/${xbean.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm7-shaded/${xbean.version}</bundle>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-finder-shaded/${xbean.version}</bundle>
         <bundle dependency="true">mvn:org.jboss.weld/weld-osgi-bundle/${weld2.version}</bundle>
         <bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.3.0.Final</bundle>
@@ -59,13 +59,12 @@
     <feature name="pax-cdi-openwebbeans" description="OpenWebBeans CDI support" version="${project.version}">
         <feature version="${project.version}">pax-cdi</feature>
         <feature version="${project.version}">pax-cdi-core</feature>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-bundleutils/${xbean44.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm5-shaded/${xbean44.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-finder-shaded/${xbean44.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-bundleutils/${xbean.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm7-shaded/${xbean.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-finder-shaded/${xbean.version}</bundle>
         <bundle dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle>
         <bundle dependency="true">mvn:javax.transaction/javax.transaction-api/1.2</bundle>
         <bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-asm5-shaded/${xbean44.version}</bundle>
         <bundle>mvn:org.apache.openwebbeans/openwebbeans-spi/${openwebbeans1.version}</bundle>
         <bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/${openwebbeans1.version}</bundle>
         <bundle>mvn:org.apache.openwebbeans/openwebbeans-el22/${openwebbeans1.version}</bundle>

diff --git a/pax-cdi-parent/pom.xml b/pax-cdi-parent/pom.xml
@@ -78,8 +78,7 @@
 
         <slf4j.version>1.6.4</slf4j.version>
         <weld2.version>2.4.5.Final</weld2.version>
-        <xbean.version>4.6</xbean.version>
-        <xbean44.version>4.4</xbean44.version>
+        <xbean.version>4.12</xbean.version>
 
         <pax.cdi.wiki.url>https://ops4j1.jira.com/wiki/spaces/PAXCDI/overview</pax.cdi.wiki.url>
     </properties>
@@ -300,7 +299,7 @@
 
             <dependency>
                 <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-asm6-shaded</artifactId>
+                <artifactId>xbean-asm7-shaded</artifactId>
                 <version>${xbean.version}</version>
             </dependency>
             <dependency>
@@ -318,11 +317,6 @@
                 <artifactId>xbean-reflect</artifactId>
                 <version>${xbean.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-asm5-shaded</artifactId>
-                <version>${xbean44.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.openwebbeans</groupId>
@@ -334,12 +328,6 @@
                 <groupId>org.apache.openwebbeans</groupId>
                 <artifactId>openwebbeans-impl</artifactId>
                 <version>${openwebbeans1.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.xbean</groupId>
-                        <artifactId>xbean-asm5-shaded</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <dependency>

diff --git a/pax-cdi-test-support/src/main/java/org/ops4j/pax/cdi/test/support/TestConfiguration.java b/pax-cdi-test-support/src/main/java/org/ops4j/pax/cdi/test/support/TestConfiguration.java
@@ -98,8 +98,8 @@ public static Option regressionDefaults() {
 
             mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.6.0"),
             mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
-            mavenBundle("org.apache.xbean", "xbean-asm5-shaded", "4.4"), //
-            mavenBundle("org.apache.xbean", "xbean-finder-shaded", "4.4"), //
+            mavenBundle("org.apache.xbean", "xbean-asm7-shaded", "4.12"), //
+            mavenBundle("org.apache.xbean", "xbean-finder-shaded", "4.12"), //
 
             // Set logback configuration via system property.
             // This way, both the driver and the container use the same configuration
@@ -260,9 +260,9 @@ public static Option openWebBeans1Bundles() {
                 mavenBundle("org.apache.openwebbeans", "openwebbeans-spi").version(OWB1_VERSION),
                 mavenBundle("org.apache.openwebbeans", "openwebbeans-el22").version(OWB1_VERSION),
                 mavenBundle("org.slf4j", "jul-to-slf4j").versionAsInProject(),
-                mavenBundle("org.apache.xbean", "xbean-bundleutils").version("4.4"),
-                mavenBundle("org.apache.xbean", "xbean-finder-shaded").version("4.4"),
-                mavenBundle("org.apache.xbean", "xbean-asm5-shaded").version("4.4")
+                mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(),
+                mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
+                mavenBundle("org.apache.xbean", "xbean-asm7-shaded").versionAsInProject()
         );
     }
 
@@ -275,7 +275,7 @@ public static Option weld2Bundles() {
                 mavenBundle("org.jboss.weld", "weld-osgi-bundle").versionAsInProject(),
                 mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(),
                 mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(),
-                mavenBundle("org.apache.xbean", "xbean-asm6-shaded").versionAsInProject()
+                mavenBundle("org.apache.xbean", "xbean-asm7-shaded").versionAsInProject()
         );
     }
 
@@ -310,8 +310,8 @@ public static Option paxWebUndertowBundles() {
             mavenBundle("org.jboss.logging", "jboss-logging", "3.3.0.Final"),
             mavenBundle("javax.annotation", "javax.annotation-api", "1.2"),
             mavenBundle("javax.servlet", "javax.servlet-api", "3.1.0"),
-            mavenBundle("org.apache.xbean", "xbean-bundleutils", "4.4"),
-            mavenBundle("org.apache.xbean", "xbean-finder", "4.4"),
+            mavenBundle("org.apache.xbean", "xbean-bundleutils", "4.12"),
+            mavenBundle("org.apache.xbean", "xbean-finder", "4.12"),
             mavenBundle("org.ow2.asm", "asm-all", "5.0.2"),
             mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.0"),
             mavenBundle("org.apache.felix", "org.apache.felix.eventadmin", "1.3.2"),

diff --git a/...-cdi-arquillian/src/main/java/org/ops4j/pax/cdi/arquillian/PaxCdiArquillianContainer.java b/...-cdi-arquillian/src/main/java/org/ops4j/pax/cdi/arquillian/PaxCdiArquillianContainer.java
@@ -194,9 +194,9 @@ private Option[] getConfigurationOptions() {
             mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.2"),
             mavenBundle("org.apache.felix", "org.apache.felix.jaas", "0.0.2"),
             mavenBundle("org.osgi", "org.osgi.compendium", "4.3.1"),
-            mavenBundle("org.apache.xbean", "xbean-bundleutils", "3.18"),
-            mavenBundle("org.apache.xbean", "xbean-asm5-shaded", "3.18"), //
-            mavenBundle("org.apache.xbean", "xbean-finder-shaded", "3.18"), //
+            mavenBundle("org.apache.xbean", "xbean-bundleutils", "4.12"),
+            mavenBundle("org.apache.xbean", "xbean-asm7-shaded", "4.12"), //
+            mavenBundle("org.apache.xbean", "xbean-finder-shaded", "4.12"), //
             mavenBundle("org.apache.geronimo.specs", "geronimo-atinject_1.0_spec").versionAsInProject(),
 
             cdiProviderBundles(),