Repository: camel Updated Branches: refs/heads/master 6b2bcea2d -> 881fe7493
CAMEL-9865: The shell condition is flaky and do not always install all the bundles. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/881fe749 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/881fe749 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/881fe749 Branch: refs/heads/master Commit: 881fe7493df38ef30a89ea985f6af88f1a8bf0cb Parents: 4e2379f Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Apr 14 09:10:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 14 09:11:46 2016 +0200 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/881fe749/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 d625f29..040774d 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -37,26 +37,19 @@ <feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${servicemix-specs-version}'>xml-specs-api</feature> <bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle> + <!-- the camel commands requires the camel-catalog to be installed --> <bundle>mvn:org.apache.camel/camel-catalog/${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> + <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle> + <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle> <!-- allow camel to access its own mbeans for karaf commands and other needs --> <config name="jmx.acl.org.apache.camel"> * = * </config> </feature> <feature name='camel-catalog' version='${project.version}' resolver='(obr)' start-level='50'> - <details>camel-catalog requires the shell feature to be installed</details> - <feature version='${project.version}'>camel-core</feature> - <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> - <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle> - </conditional> + <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> </feature> <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature>
