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 2013/12/26 19:26:32 UTC
git commit: [KARAF-2658] Include Pax CDI 0.6.0 features in the Karaf
enterprise features
Updated Branches:
refs/heads/karaf-2.x 3f6857985 -> 16e338047
[KARAF-2658] Include Pax CDI 0.6.0 features in the Karaf enterprise features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/16e33804
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/16e33804
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/16e33804
Branch: refs/heads/karaf-2.x
Commit: 16e338047d29fa6c5704ad0d2778c98e686043d1
Parents: 3f68579
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Dec 26 19:25:58 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Dec 26 19:25:58 2013 +0100
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/resources/features.xml | 2 ++
pom.xml | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/16e33804/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 b5ee3e8..a9e3ace 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -20,6 +20,8 @@
<features name="karaf-enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+ <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
+
<feature name="transaction" description="OSGi Transaction Manager" version="${aries.transaction.version}" resolver="(obr)">
<details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details>
<config name="org.apache.aries.transaction">
http://git-wip-us.apache.org/repos/asf/karaf/blob/16e33804/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 95561e1..18c3741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,6 +178,7 @@
<osgi.version>4.3.1</osgi.version>
<org.json.version>20131018</org.json.version>
<pax.base.version>1.4.0</pax.base.version>
+ <pax.cdi.version>0.6.0</pax.cdi.version>
<pax.exam.version>3.4.0</pax.exam.version>
<pax.logging.version>1.7.1</pax.logging.version>
<pax.url.version>1.3.6</pax.url.version>