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/10/08 16:52:21 UTC
[1/2] karaf git commit: [KARAF-4043] Upgrade to Felix Resolver 1.6.0
Repository: karaf
Updated Branches:
refs/heads/master fb857f479 -> af6ce241a
[KARAF-4043] Upgrade to Felix Resolver 1.6.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/870caca9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/870caca9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/870caca9
Branch: refs/heads/master
Commit: 870caca94d88993eda0b7be308219ddccaa98e0f
Parents: de27df8
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Oct 8 16:51:30 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Oct 8 16:51:30 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/870caca9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d88b1e4..2d73954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
<felix.scr.compat.version>1.0.2</felix.scr.compat.version>
<felix.scr.webconsole.plugin.version>1.0.0</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.6.0</felix.scr.annotation.version>
- <felix.resolver.version>1.4.0</felix.resolver.version>
+ <felix.resolver.version>1.6.0</felix.resolver.version>
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
[2/2] karaf 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/af6ce241
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/af6ce241
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/af6ce241
Branch: refs/heads/master
Commit: af6ce241a9590e2fd6371af19962879afe730a60
Parents: 870caca fb857f4
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Oct 8 16:52:14 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Oct 8 16:52:14 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/profile/assembly/Builder.java | 12 +++++++
.../org/apache/karaf/tooling/AssemblyMojo.java | 37 ++++++++++++++++++++
2 files changed, 49 insertions(+)
----------------------------------------------------------------------