Repository: karaf Updated Branches: refs/heads/master 8a7b13990 -> 6d6d39f61
[KARAF-4018] Add transaction.blueprint 2.0.0 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/6d6d39f6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6d6d39f6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6d6d39f6 Branch: refs/heads/master Commit: 6d6d39f619baf1bab1ee0f22edb16b915252af5c Parents: 8a7b139 Author: Christian Schneider <[email protected]> Authored: Fri Sep 25 14:00:44 2015 +0200 Committer: Christian Schneider <[email protected]> Committed: Fri Sep 25 14:00:44 2015 +0200 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 1 + pom.xml | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6d6d39f6/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 ff70b4a..8320c55 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -52,6 +52,7 @@ <condition>aries-blueprint</condition> <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle> <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle> + <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version2}</bundle> </conditional> </feature> http://git-wip-us.apache.org/repos/asf/karaf/blob/6d6d39f6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3e145a4..1db86df 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,7 @@ <aries.subsystem.core.version>1.2.0</aries.subsystem.core.version> <aries.transaction.manager.version>1.3.0</aries.transaction.manager.version> <aries.transaction.blueprint.version>1.1.1</aries.transaction.blueprint.version> + <aries.transaction.blueprint.version2>2.0.0</aries.transaction.blueprint.version2> <aries.transaction.jdbc.version>2.1.1</aries.transaction.jdbc.version> <aries.util.version>1.1.1</aries.util.version>
