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/01 17:24:02 UTC
karaf git commit: [KARAF-3428] Upgrade to Pax CDI 0.10.0-SNAPSHOT and
cleanup the features
Repository: karaf
Updated Branches:
refs/heads/master c45e6b132 -> fd135b633
[KARAF-3428] Upgrade to Pax CDI 0.10.0-SNAPSHOT and cleanup the features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fd135b63
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fd135b63
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fd135b63
Branch: refs/heads/master
Commit: fd135b633e991170d8fa7486bd4bf691e0440347
Parents: c45e6b1
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jan 1 17:23:12 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jan 1 17:23:12 2015 +0100
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 15 ---
.../karaf/itests/features/CdiFeaturesTest.java | 107 -------------------
.../itests/features/PaxCdiFeaturesTest.java | 97 +++++++++++++++++
pom.xml | 4 +-
4 files changed, 98 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd135b63/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index bf410bc..03d60ba 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -280,21 +280,6 @@
</requirement>
</feature>
- <feature name="openwebbeans" description="Apache OpenWebBeans CDI container support" version="${openwebbeans.version}">
- <details>Add support of Apache OpenWebBeans CDI container.</details>
- <feature>http</feature>
- <feature>pax-cdi-openwebbeans</feature>
- <bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/${openwebbeans.version}</bundle>
- <bundle>mvn:org.apache.openwebbeans/openwebbeans-osgi/${openwebbeans.version}</bundle>
- </feature>
-
- <feature name="weld" description="JBoss Weld CDI container support" version="${weld.version}">
- <details>Add support of JBoss Weld CDI container.</details>
- <feature>pax-cdi-weld</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
- <bundle>mvn:org.jboss.weld/weld-osgi-bundle/${weld.version}</bundle>
- </feature>
-
<feature name="application-without-isolation" description="Provide EBA archive support" version="${aries.application.version}">
<details>Support of the Aries EBA archives</details>
<!-- pre-requisites-->
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd135b63/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java
deleted file mode 100644
index b25b7c4..0000000
--- a/itests/src/test/java/org/apache/karaf/itests/features/CdiFeaturesTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.itests.features;
-
-import org.apache.karaf.itests.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class CdiFeaturesTest extends KarafTestSupport {
-
- @Test
- public void installOpenWebBeansFeature() throws Exception {
- installAssertAndUninstallFeatures("openwebbeans");
- }
-
- @Test
- public void installWeldFeature() throws Exception {
- installAssertAndUninstallFeatures("weld");
- }
-
- @Test
- public void installPaxCdiFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi");
- }
-
- @Test
- public void installPaxCdi11Feature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.1");
- }
-
- @Test
- public void installPaxCdi12Feature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.2");
- }
-
- @Test
- public void installPaxCdiWeldFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-weld");
- }
-
- @Test
- public void installPaxCdi11WeldFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.1-weld");
- }
-
- @Test
- public void installPaxCdi12WeldFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.2-weld");
- }
-
- @Test
- public void installPaxCdiOpenwebbeansFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-openwebbeans");
- }
-
- @Test
- public void installPaxCdiWebFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-web");
- }
-
- @Test
- public void installPaxCdi11WebFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.1-web");
- }
-
- @Test
- public void installPaxCdi12WebFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.2-web");
- }
-
- @Test
- public void installPaxCdiWebWeldFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-web-weld");
- }
-
- @Test
- public void installPaxCdi11WebWeldFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.1-web-weld");
- }
-
- @Test
- public void installPaxCdi12WebWeldFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-1.2-web-weld");
- }
-
- @Test
- public void installPaxCdiWebOpenwebbeansFeature() throws Exception {
- installAssertAndUninstallFeatures("pax-cdi-web-openwebbeans");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd135b63/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
new file mode 100644
index 0000000..9bbfb53
--- /dev/null
+++ b/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.itests.features;
+
+import org.apache.karaf.itests.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class PaxCdiFeaturesTest extends KarafTestSupport {
+
+ @Test
+ public void installPaxCdiFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi");
+ }
+
+ @Test
+ public void installPaxCdi11Feature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.1");
+ }
+
+ @Test
+ public void installPaxCdi12Feature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.2");
+ }
+
+ @Test
+ public void installPaxCdiWeldFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-weld");
+ }
+
+ @Test
+ public void installPaxCdi11WeldFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.1-weld");
+ }
+
+ @Test
+ public void installPaxCdi12WeldFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.2-weld");
+ }
+
+ @Test
+ public void installPaxCdiOpenwebbeansFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-openwebbeans");
+ }
+
+ @Test
+ public void installPaxCdiWebFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-web");
+ }
+
+ @Test
+ public void installPaxCdi11WebFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.1-web");
+ }
+
+ @Test
+ public void installPaxCdi12WebFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.2-web");
+ }
+
+ @Test
+ public void installPaxCdiWebWeldFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-web-weld");
+ }
+
+ @Test
+ public void installPaxCdi11WebWeldFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.1-web-weld");
+ }
+
+ @Test
+ public void installPaxCdi12WebWeldFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-1.2-web-weld");
+ }
+
+ @Test
+ public void installPaxCdiWebOpenwebbeansFeature() throws Exception {
+ installAssertAndUninstallFeatures("pax-cdi-web-openwebbeans");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd135b63/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c5b410..b483c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,11 +225,10 @@
<log4j.version>1.2.17</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.7</mina.version>
- <openwebbeans.version>1.2.6</openwebbeans.version>
<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.9.0</pax.cdi.version>
+ <pax.cdi.version>0.10.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>
@@ -254,7 +253,6 @@
<xbean.version>3.18</xbean.version>
<xerces.version>2.11.0</xerces.version>
<javax.mail.version>1.4.5</javax.mail.version>
- <weld.version>2.1.1.Final</weld.version>
<!-- Furter used maven plugin versions; e.g. in the docs -->
<plugin.depends.version>1.2</plugin.depends.version>