You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2015/07/31 21:07:36 UTC
camel git commit: CAMEL-9039: Added karaf conditional to camel-core
feature to check for shell feature before installing camel-commands-core and
camel-karaf-commands
Repository: camel
Updated Branches:
refs/heads/master a683754b1 -> 899ecc1ea
CAMEL-9039: Added karaf conditional to camel-core feature to check for shell feature before installing camel-commands-core and camel-karaf-commands
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/899ecc1e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/899ecc1e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/899ecc1e
Branch: refs/heads/master
Commit: 899ecc1ea9fa5a5eddbfad9179f4f199fadc9b1e
Parents: a683754
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Fri Jul 31 12:08:40 2015 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Fri Jul 31 12:08:40 2015 -0700
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/899ecc1e/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 9d74e49..08d45e5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -37,8 +37,11 @@
<feature version='${servicemix-specs-version}'>xml-specs-api</feature>
<bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-catalog/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
- <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
+ <conditional>
+ <condition>shell</condition>
+ <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
+ </conditional>
<!-- allow camel to access its own mbeans for karaf commands and other needs -->
<config name="jmx.acl.org.apache.camel">
* = *