Repository: camel Updated Branches: refs/heads/camel-2.18.x 79f56f1a3 -> aa435cd0b
CAMEL-10410: Karaf features: install camel-karaf-commands and camel-karaf-commands-catalog only if karaf shell is installed Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa435cd0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa435cd0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa435cd0 Branch: refs/heads/camel-2.18.x Commit: aa435cd0bc5930f05f49723b8052e438f10f9bc1 Parents: 79f56f1 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Mon Oct 24 12:27:36 2016 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Mon Oct 24 12:29:07 2016 +0200 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/aa435cd0/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 df432a8..bb61f13 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -40,7 +40,10 @@ <!-- the camel commands requires the camel-catalog to be installed --> <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.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"> * = * @@ -49,7 +52,10 @@ <feature name='camel-catalog' version='${project.version}' resolver='(obr)' start-level='50'> <details>Install the camel catalog commands</details> <feature version='${project.version}'>camel-core</feature> - <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle> + <conditional> + <condition>shell</condition> + <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle> + </conditional> </feature> <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature>
