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/04/09 12:05:37 UTC

[1/2] git commit: Revert "[KARAF-2874] Upgrade to xbean 3.17"

Repository: karaf
Updated Branches:
  refs/heads/master d7de15972 -> 678919692


Revert "[KARAF-2874] Upgrade to xbean 3.17"

This reverts commit fe2627f22756fa67c95969e08df3edbb8c3649bf.


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

Branch: refs/heads/master
Commit: d2dfe5663c8e05112cb2839b3128bca9ee46d96a
Parents: 788eee9
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 9 12:04:58 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 9 12:04:58 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/d2dfe566/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d90475..b4f7124 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,7 @@
 
         <sshd.version>0.10.1</sshd.version>
         <struts.bundle.version>1.3.10_1</struts.bundle.version>
-        <xbean.version>3.17</xbean.version>
+        <xbean.version>3.16</xbean.version>
         <xerces.version>2.11.0</xerces.version>
         <javax.mail.version>1.4.5</javax.mail.version>
         <weld.version>2.1.1.Final</weld.version>


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

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


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

Branch: refs/heads/master
Commit: 6789196927345d5be015c34c3e452f2611fa77b5
Parents: d2dfe56 d7de159
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 9 12:05:23 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 9 12:05:23 2014 +0200

----------------------------------------------------------------------
 .../internal/deployment/DeploymentBuilder.java  |  5 +-
 .../internal/service/FeaturesServiceImpl.java   | 56 ++++++++++++++++----
 2 files changed, 48 insertions(+), 13 deletions(-)
----------------------------------------------------------------------