You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/09/17 13:47:37 UTC
karaf git commit: [KARAF-3998] Adding org.apache.felix.coordinator to
transaction feature
Repository: karaf
Updated Branches:
refs/heads/master 91678ff51 -> db6799ad2
[KARAF-3998] Adding org.apache.felix.coordinator to transaction feature
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/db6799ad
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/db6799ad
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/db6799ad
Branch: refs/heads/master
Commit: db6799ad2f2ba33afb6d6f578115ebc506fd7980
Parents: 91678ff
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Sep 17 13:02:33 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Sep 17 13:02:33 2015 +0200
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/feature/feature.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/db6799ad/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 a8baaa1..33f68d1 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -50,6 +50,7 @@
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
+ <bundle start-level="30" dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
</conditional>
</feature>
@@ -90,7 +91,7 @@
<details>JPA implementation provided by Apache Aries JPA 2.x. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
<feature version="[1.1,2)">transaction-api</feature>
<feature version="[2.0.0,2.2.0)">persistence-api</feature>
- <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
+ <bundle start-level="30" dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/${aries.jpa.version}</bundle>