[PAXCDI-190] Upgrade to DeltaSpike 1.4.1-SNAPSHOT

Author: hwellmann

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/Jpa21TransactionalTest.java

@@ -92,6 +92,8 @@ public Option[] config() {
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-jpa-module-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-partial-bean-module-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-data-module-api").versionAsInProject(),
+            mavenBundle("org.apache.deltaspike.modules", "deltaspike-proxy-module-api").versionAsInProject(),
+            mavenBundle("org.apache.deltaspike.modules", "deltaspike-proxy-module-impl-asm5").versionAsInProject(),
 
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-jpa-module-impl").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-partial-bean-module-impl").versionAsInProject(),

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/TransactionalTest.java

@@ -71,12 +71,14 @@ public Option[] config() {
             mavenBundle("org.apache.derby", "derby").versionAsInProject(),
             mavenBundle("org.osgi", "org.osgi.enterprise").versionAsInProject(),
 
-            // unchanged DeltaSpike bundles
+            // DeltaSpike bundles
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-impl").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-jpa-module-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-partial-bean-module-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-data-module-api").versionAsInProject(),
+            mavenBundle("org.apache.deltaspike.modules", "deltaspike-proxy-module-api").versionAsInProject(),
+            mavenBundle("org.apache.deltaspike.modules", "deltaspike-proxy-module-impl-asm5").versionAsInProject(),
 
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-jpa-module-impl").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.modules", "deltaspike-partial-bean-module-impl").versionAsInProject(),

pax-cdi-parent/pom.xml

@@ -13,7 +13,7 @@
     <name>OPS4J Pax CDI Parent POM</name>
 
     <properties>
-        <deltaspike.version>1.3.0</deltaspike.version>
+        <deltaspike.version>1.4.1-SNAPSHOT</deltaspike.version>
         <guava.version>13.0.1</guava.version>
         <jersey.version>1.13</jersey.version>
         <jetty.version>9.0.7.v20131107</jetty.version>

pax-cdi-samples/pax-cdi-sample2-service/pom.xml

@@ -81,8 +81,11 @@
                         <Bundle-SymbolicName>org.ops4j.pax.cdi.sample2.service</Bundle-SymbolicName>
                         <Import-Package>
                             javax.persistence*;version="[1.1,3)",
-                            org.apache.deltaspike.partialbean.impl.interception,
-                            org.apache.deltaspike.partialbean.impl.proxy,
+                            org.apache.deltaspike.partialbean.impl.interception;resolution:=optional,
+                            org.apache.deltaspike.partialbean.impl.proxy;resolution:=optional,
+                            org.apache.deltaspike.proxy.impl;resolution:=optional,
+                            org.apache.deltaspike.proxy.impl.invocation;resolution:=optional,
+                            org.apache.deltaspike.proxy.spi;resolution:=optional,
                             org.apache.deltaspike.data.impl.handler,
                             *
                         </Import-Package>