Repository: karaf Updated Branches: refs/heads/master 570ae865d -> 9414521c1
[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/9414521c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9414521c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9414521c Branch: refs/heads/master Commit: 9414521c13ddc200a92e3f1d3b270665dc8a4c07 Parents: 570ae86 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Nov 2 07:04:17 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Nov 2 07:04:17 2014 +0100 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9414521c/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 c5bd60c..396e0ae 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -58,8 +58,8 @@ </conditional> </feature> - <feature name="transaction" description="OSGi Transaction Manager" version="1.1.0"> - <details>JTA implementation provided by Apache Aries Transaction 1.1.0</details> + <feature name="transaction" description="OSGi Transaction Manager" version="1.1.1"> + <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 @@ -69,7 +69,7 @@ aries.transaction.howl.bufferSizeKBytes = 4 </config> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.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/9414521c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 53e7fd8..95907d3 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ <aries.proxy.api.version>1.0.1</aries.proxy.api.version> <aries.subsystem.api.version>1.0.0</aries.subsystem.api.version> <aries.subsystem.core.version>1.1.0</aries.subsystem.core.version> - <aries.transaction.manager.version>1.1.0</aries.transaction.manager.version> + <aries.transaction.manager.version>1.1.1</aries.transaction.manager.version> <aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version> <aries.transaction.jdbc.version>2.0.0</aries.transaction.jdbc.version> <aries.util.version>1.1.0</aries.util.version>
