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 2015/03/02 10:46:20 UTC

[1/2] karaf git commit: [KARAF-3556] Upgrade to Aries Transaction Blueprint 1.0.2

Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x bfd0db0e7 -> 1b9fecbba


[KARAF-3556] Upgrade to Aries Transaction Blueprint 1.0.2


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

Branch: refs/heads/karaf-3.0.x
Commit: ac8b9a3ef1957c5e024f45094958c9f1b2ab85da
Parents: 6b513a5
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Mar 2 10:39:27 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Mar 2 10:39:27 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ac8b9a3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2cbf31..41a5ff4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
         <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.1</aries.transaction.manager.version>
-        <aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version>
+        <aries.transaction.blueprint.version>1.0.2</aries.transaction.blueprint.version>
         <aries.transaction.jdbc.version>2.0.0</aries.transaction.jdbc.version>
         <aries.util.version>1.1.0</aries.util.version>
 


[2/2] karaf git commit: Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x

Posted by jb...@apache.org.
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x


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

Branch: refs/heads/karaf-3.0.x
Commit: 1b9fecbba25ff0f0362a8f9b763c842b2356be89
Parents: ac8b9a3 bfd0db0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Mar 2 10:46:07 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Mar 2 10:46:07 2015 +0100

----------------------------------------------------------------------
 .../service/guard/impl/GuardProxyCatalog.java   | 30 +++++++++++---------
 .../impl/SecuredCommandConfigTransformer.java   | 11 ++++---
 2 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------