Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 762cf8b77 -> 3a67dbcdf
[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/3a67dbcd Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3a67dbcd Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3a67dbcd Branch: refs/heads/karaf-3.0.x Commit: 3a67dbcdfd282dd15f4387e846d8579339a7f4fe Parents: 762cf8b Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Nov 2 11:22:12 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Nov 2 11:22:12 2014 +0100 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3a67dbcd/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 c76515e..d412624 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -55,7 +55,7 @@ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle> </feature> - <feature name="transaction" description="OSGi Transaction Manager" version="1.1.0" resolver="(obr)"> + <feature name="transaction" description="OSGi Transaction Manager" version="1.1.1" resolver="(obr)"> <details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details> <config name="org.apache.aries.transaction"> aries.transaction.recoverable = true @@ -67,7 +67,7 @@ </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.blueprint/${aries.transaction.blueprint.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> </feature> <feature name="connector" description="OSGi support for JCA Connector 1.5" version="2.2.2"> http://git-wip-us.apache.org/repos/asf/karaf/blob/3a67dbcd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 86b202b..15af2f4 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ <aries.jndi.api.version>1.1.0</aries.jndi.api.version> <aries.proxy.version>1.0.4</aries.proxy.version> <aries.proxy.api.version>1.0.1</aries.proxy.api.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>
