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 2014/01/09 17:28:23 UTC
git commit: [KARAF-2642] Add cdi enterprise features
Updated Branches:
refs/heads/karaf-2.x c8ad51a20 -> 5302349f2
[KARAF-2642] Add cdi enterprise features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5302349f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5302349f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5302349f
Branch: refs/heads/karaf-2.x
Commit: 5302349f2a6127887c72dcc4cfc5fc4a7096bd5d
Parents: c8ad51a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jan 9 17:26:53 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jan 9 17:26:53 2014 +0100
----------------------------------------------------------------------
.../enterprise/src/main/resources/features.xml | 14 ++++++++++++++
pom.xml | 2 ++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5302349f/assemblies/features/enterprise/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/resources/features.xml b/assemblies/features/enterprise/src/main/resources/features.xml
index dce1b18..066e7fe 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -128,6 +128,20 @@
<bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle>
</feature>
+ <feature name="openwebbeans" description="Apache OpenWebBeans CDI container support" version="${openwebbeans.version}" resolver="(obr)">
+ <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}" resolver="(obr)">
+ <details>Add support of JBoss Weld CDI container.</details>
+ <feature>pax-cdi-weld</feature>
+ <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>
<feature version="${project.version}">obr</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/5302349f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c72bf7f..34b9a7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,6 +192,7 @@
<maven.version>3.0-alpha-2</maven.version>
<mina.version>2.0.7</mina.version>
<openjpa.version>2.3.0</openjpa.version>
+ <openwebbeans.version>1.2.1</openwebbeans.version>
<osgi.version>4.3.1</osgi.version>
<org.json.version>20131018</org.json.version>
<pax.base.version>1.4.0</pax.base.version>
@@ -218,6 +219,7 @@
<xbean.version>3.16</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>
<http.feature.version>[2,3)</http.feature.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>