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/03/15 11:47:35 UTC
camel git commit: More features can install in karaf
Repository: camel
Updated Branches:
refs/heads/master d1bac6738 -> 26ac0112e
More features can install in karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26ac0112
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26ac0112
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26ac0112
Branch: refs/heads/master
Commit: 26ac0112e64c93523af76be8b0202e25364f7592
Parents: d1bac67
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 15 11:47:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 15 11:47:27 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/pom.xml | 5 +++--
.../karaf/features/src/main/resources/features.xml | 15 +++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/26ac0112/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index bc67707..f950c9f 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -210,9 +210,10 @@
<feature>framework</feature>
</framework>
<features>
- <feature>camel|camel-(?!ignite)*</feature>
+ <!-- to add multiple separate by | such as (ignite|catalog) -->
+ <feature>camel|camel-(?!(ignite))*</feature>
</features>
- <configuration>file://${project.build.directory}/classes/config.properties</configuration>
+ <configuration>file://${project.build.directory}/classes/config.properties</configuration>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/camel/blob/26ac0112/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 e40c1c0..d55dd03 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -49,11 +49,14 @@
</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>
- <feature>shell</feature>
- <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>
+ <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>
</feature>
<feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'>
<feature>aries-blueprint</feature>
@@ -743,8 +746,10 @@
<details>The camel-infinispan feature requires Java 8</details>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
+ <feature>aries-blueprint</feature>
<bundle dependency='true'>mvn:org.infinispan/infinispan-core/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-commons/${infinispan-version}</bundle>
+ <bundle dependency='true'>mvn:org.infinispan/infinispan-query-dsl/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
@@ -1503,6 +1508,7 @@
</feature>
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
<feature>http</feature>
+ <feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range}'>spring</feature>
<feature version='${spring-version-range}'>spring-jms</feature>
<feature version='${spring-version-range}'>spring-oxm</feature>
@@ -1571,6 +1577,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-scala-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-paranamer/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${jackson2-scala-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger-scala-bundle-version}</bundle>