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/03/28 11:02:49 UTC
[1/2] git commit: [KARAF-2856] Add wagon-http-lightweight dependency
to the karaf-maven-plugin
Repository: karaf
Updated Branches:
refs/heads/master c3aa9da26 -> d2f9d5cbd
[KARAF-2856] Add wagon-http-lightweight dependency to the karaf-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/04ef091d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/04ef091d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/04ef091d
Branch: refs/heads/master
Commit: 04ef091dab7b1397c6a6dab478e9340944fb36db
Parents: a4b2d3f
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 28 10:50:49 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 28 10:50:49 2014 +0100
----------------------------------------------------------------------
tooling/karaf-maven-plugin/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/04ef091d/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 8dc2fc9..e525b45 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -78,6 +78,11 @@
<artifactId>maven-compat</artifactId>
<version>3.0.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>2.6</version>
+ </dependency>
<dependency>
[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/d2f9d5cb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d2f9d5cb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d2f9d5cb
Branch: refs/heads/master
Commit: d2f9d5cbd19400b7fcf4f4bfe3f0c4162e91d1e9
Parents: 04ef091 c3aa9da
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 28 10:54:55 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 28 10:54:55 2014 +0100
----------------------------------------------------------------------
.../shell/impl/action/osgi/CommandExtension.java | 8 +++++++-
.../impl/console/osgi/LocalConsoleManager.java | 1 +
.../wrapper/internal/WrapperServiceImpl.java | 16 ++++++++++++++++
.../wrapper/internal/solaris/x86_64/karaf-wrapper | Bin 0 -> 160000 bytes
.../wrapper/internal/solaris/x86_64/libwrapper.so | Bin 0 -> 19072 bytes
5 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------