You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/14 09:12:02 UTC
[7/8] camel git commit: CAMEL-9865: Camel Karaf commands works with
Karaf 3 and 4 again
CAMEL-9865: Camel Karaf commands works with Karaf 3 and 4 again
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e2379fa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e2379fa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e2379fa
Branch: refs/heads/master
Commit: 4e2379fa639f45c689ad8591144fa6537fd14790
Parents: fc7e3fe
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 14 09:03:23 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 14 09:11:46 2016 +0200
----------------------------------------------------------------------
platforms/karaf/commands/pom.xml | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4e2379fa/platforms/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 871bcd9..a32e014 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -50,14 +50,20 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>${karaf-version}</version>
+ <version>${karaf4-version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
<version>${karaf-version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
<!-- Test -->
<dependency>
<groupId>junit</groupId>
@@ -75,10 +81,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Embed-Dependency>*;artifactId=org.apache.karaf.util;inline=true</Embed-Dependency>
<Import-Package>
- org.apache.felix.service.command;mandatory:=status;status=provisional;version="[0.6,1)",
- org.apache.felix.gogo.commands;version="[0.6,1)",
- org.apache.karaf.shell.console;version="[2.2,4)",
+ !org.apache.felix.utils.properties,
+ org.apache.felix.service.command;version="[0.16,1)",
+ org.apache.felix.gogo.commands;version="[0.16,1)",
+ org.apache.karaf.shell.console;version="[3,5)",
org.slf4j.*;version="[1.6,2)",
jline.*;version="[2.1,3)",
*