Repository: karaf Updated Branches: refs/heads/karaf-2.x b99d0f401 -> d5832b8ff
[KARAF-3331] Upgrade to Aries Transaction Manager 1.1.1 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d5832b8f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d5832b8f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d5832b8f Branch: refs/heads/karaf-2.x Commit: d5832b8ffcc0016e2786a958e84b60c42c5a7984 Parents: b99d0f4 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Nov 2 19:10:00 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Nov 2 19:10:00 2014 +0100 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/resources/features.xml | 6 +++--- .../java/org/apache/karaf/itests/EnterpriseFeaturesTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d5832b8f/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 d54d1bc..045fb36 100644 --- a/assemblies/features/enterprise/src/main/resources/features.xml +++ b/assemblies/features/enterprise/src/main/resources/features.xml @@ -42,8 +42,8 @@ </conditional> </feature> - <feature name="transaction" description="OSGi Transaction Manager" version="1.1.0" resolver="(obr)"> - <details>JTA implementation provided by Apache Aries Transaction 1.1.0</details> + <feature name="transaction" description="OSGi Transaction Manager" version="1.1.1" resolver="(obr)"> + <details>JTA implementation provided by Apache Aries Transaction 1.1.1</details> <config name="org.apache.aries.transaction"> aries.transaction.recoverable = true aries.transaction.timeout = 600 @@ -54,7 +54,7 @@ </config> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> - <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.0</bundle> + <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.1</bundle> <conditional> <condition>aries-blueprint</condition> <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/d5832b8f/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java index 33bcf96..89882ae 100644 --- a/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java @@ -32,8 +32,8 @@ public class EnterpriseFeaturesTest extends KarafTestSupport { System.out.println("===== TESTING TRANSACTION 1.0.1 FEATURE ====="); installAndAssertFeature("transaction", "1.0.1"); System.out.println(""); - System.out.println("===== TESTING TRANSACTION 1.1.0 FEATURE ====="); - installAndAssertFeature("transaction", "1.1.0"); + System.out.println("===== TESTING TRANSACTION 1.1.1 FEATURE ====="); + installAndAssertFeature("transaction", "1.1.1"); } @Test
