You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/23 14:57:02 UTC

karaf git commit: [KARAF-3464] Upgrade to PAX CDI 0.11.0-SNAPSHOT

Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 7769b9b5c -> 8695128f5


[KARAF-3464] Upgrade to PAX CDI 0.11.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8695128f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8695128f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8695128f

Branch: refs/heads/karaf-3.0.x
Commit: 8695128f55eea68a5f0545f44fdac84184391e4a
Parents: 7769b9b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 23 14:56:33 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 23 14:56:33 2015 +0100

----------------------------------------------------------------------
 .../org/apache/karaf/itests/features/PaxCdiFeaturesTest.java   | 6 ------
 pom.xml                                                        | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/8695128f/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java
index 33dc180..53f9427 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java
@@ -14,7 +14,6 @@
 package org.apache.karaf.itests.features;
 
 import org.apache.karaf.itests.KarafTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
@@ -71,31 +70,26 @@ public class PaxCdiFeaturesTest extends KarafTestSupport {
     }
 
     @Test
-    @Ignore("PAXCDI-146 Require Pax Web 4.x/Karaf 4")
     public void installPaxCdi12WebFeature() throws Exception {
         installAssertAndUninstallFeatures("pax-cdi-1.2-web");
     }
 
     @Test
-    @Ignore("PAXCDI-146: Require Pax Web 4.x/Karaf 4")
     public void installPaxCdiWebWeldFeature() throws Exception {
         installAssertAndUninstallFeatures("pax-cdi-web-weld");
     }
 
     @Test
-    @Ignore("PAXCDI-146: Require Pax Web 4.x/Karaf 4")
     public void installPaxCdi11WebWeldFeature() throws Exception {
         installAssertAndUninstallFeatures("pax-cdi-1.1-web-weld");
     }
 
     @Test
-    @Ignore("PAXCDI-146: Require Pax Web 4.x/Karaf 4")
     public void installPaxCdi12WebWeldFeature() throws Exception {
         installAssertAndUninstallFeatures("pax-cdi-1.2-web-weld");
     }
 
     @Test
-    @Ignore("PAXCDI-146: Require Pax Web 4.x/Karaf 4")
     public void installPaxCdiWebOpenwebbeansFeature() throws Exception {
         installAssertAndUninstallFeatures("pax-cdi-web-openwebbeans");
     }

http://git-wip-us.apache.org/repos/asf/karaf/blob/8695128f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c53e34..5bb20e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
         <osgi.version>5.0.0</osgi.version>
         <osgi.compendium.version>5.0.0</osgi.compendium.version>
         <org.json.version>20140107</org.json.version>
-        <pax.cdi.version>0.10.0</pax.cdi.version>
+        <pax.cdi.version>0.11.0-SNAPSHOT</pax.cdi.version>
         <pax.exam.version>4.3.0</pax.exam.version>
         <pax.logging.version>1.8.1</pax.logging.version>
         <pax.base.version>1.5.0</pax.base.version>