Updated Branches: refs/heads/master 0e68cf856 -> 39390da5f
[KARAF-2549] Add new openwebbeans and weld enterprise features Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6e68e801 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6e68e801 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6e68e801 Branch: refs/heads/master Commit: 6e68e80151939d75bda76a9a4ee1676a619b1839 Parents: 0e68cf8 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Dec 20 14:16:27 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Dec 20 14:16:27 2013 +0100 ---------------------------------------------------------------------- .../features/enterprise/src/main/feature/feature.xml | 14 ++++++++++++++ pom.xml | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6e68e801/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 fc7494a..79d176a 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -87,6 +87,20 @@ <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.command/${project.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> <!-- pre-requisites--> http://git-wip-us.apache.org/repos/asf/karaf/blob/6e68e801/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0f6bba7..96a6726 100644 --- a/pom.xml +++ b/pom.xml @@ -209,6 +209,7 @@ <maven.version>2.0.9</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>5.0.0</osgi.version> <osgi.compendium.version>5.0.0</osgi.compendium.version> <org.json.version>20131018</org.json.version> @@ -231,7 +232,8 @@ <xbean.version>3.16</xbean.version> <xerces.version>2.11.0</xerces.version> <javax.mail.version>1.4.5</javax.mail.version> - <http.feature.version>[3,4)</http.feature.version> + <http.feature.version>[3,4)</http.feature.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>
