You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/01/24 17:16:21 UTC

git commit: [KARAF-2736] Upgrade to Aries Transaction Manager 1.1.0

Updated Branches:
  refs/heads/master 36a941bbd -> 03dc59620


[KARAF-2736] Upgrade to Aries Transaction Manager 1.1.0


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/03dc5962
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/03dc5962
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/03dc5962

Branch: refs/heads/master
Commit: 03dc59620e5f844d05e7792817a52ec1fb251e19
Parents: 36a941b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 24 17:15:48 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 24 17:15:48 2014 +0100

----------------------------------------------------------------------
 manual/src/main/webapp/users-guide/jta.conf | 6 +++---
 pom.xml                                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/03dc5962/manual/src/main/webapp/users-guide/jta.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/jta.conf b/manual/src/main/webapp/users-guide/jta.conf
index 718068a..3a21b5d 100644
--- a/manual/src/main/webapp/users-guide/jta.conf
+++ b/manual/src/main/webapp/users-guide/jta.conf
@@ -37,7 +37,7 @@ You can see the configuration properties using:
 karaf@root()> config:list "(service.pid=org.apache.aries.transaction)"
 ----------------------------------------------------------------
 Pid:            org.apache.aries.transaction
-BundleLocation: mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1
+BundleLocation: mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.0
 Properties:
    aries.transaction.recoverable = true
    aries.transaction.timeout = 600
@@ -75,7 +75,7 @@ karaf@root()> config:update
 karaf@root()> config:list "(service.pid=org.apache.aries.transaction)"
 ----------------------------------------------------------------
 Pid:            org.apache.aries.transaction
-BundleLocation: mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1
+BundleLocation: mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.0
 Properties:
    aries.transaction.recoverable = true
    aries.transaction.timeout = 1200
@@ -102,4 +102,4 @@ aries.transaction.howl.maxLogFiles = 2
 aries.transaction.howl.logFileDir = /opt/apache-karaf-3.0.0/data/txlog
 aries.transaction.howl.bufferSizeKBytes = 4
 {code}
-{warning}
\ No newline at end of file
+{warning}

http://git-wip-us.apache.org/repos/asf/karaf/blob/03dc5962/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3340567..b5e60ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,7 @@
         <aries.proxy.version>1.0.2</aries.proxy.version>
         <aries.proxy.api.version>1.0.0</aries.proxy.api.version>
         <aries.transaction.version>1.0.1</aries.transaction.version>
-        <aries.transaction.manager.version>1.0.1</aries.transaction.manager.version>
+        <aries.transaction.manager.version>1.1.0</aries.transaction.manager.version>
         <aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version>
         <aries.transaction.jdbc.version>1.0.0</aries.transaction.jdbc.version>
         <aries.util.version>1.1.0</aries.util.version>