[camel] branch master updated: Updated camel-activemq features

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 7bd3a41  Updated camel-activemq features
7bd3a41 is described below

commit 7bd3a41879daa1531a22c7197f3039e7e837f6b8
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Nov 15 05:34:59 2019 +0100

    Updated camel-activemq features
---
 platforms/karaf/features/src/main/resources/features.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 1e2a6f7..2952094 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -118,18 +118,17 @@
   <feature name='camel-activemq' version='${project.version}' start-level='50'>
     <feature prerequisite='true'>wrap</feature>
     <feature version='${project.version}'>camel-jms</feature>
-    <feature version="[4,6)">spring</feature>
-    <feature version="[4,5)">shell-compat</feature>
+    <feature version="[5,6)">spring</feature>
     <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
     <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
     <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
     <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
-    <bundle 
dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/0.6.4</bundle>
+    <bundle 
dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/0.12.0</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.2.11_1</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.commons/commons-pool2/2.4.2</bundle>
-    <bundle dependency='true'>mvn:commons-net/commons-net/3.6</bundle>
-    <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/3.4.6</bundle>
-    
<bundle>wrap:mvn:org.apache.activemq/activemq-osgi/${activemq-version}$overwrite=merge&amp;Import-Package=org.springframework.*;resolution:=optional;version="[4,6)",*;resolution:=optional</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
+    <bundle 
dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+    
<bundle>wrap:mvn:org.apache.activemq/activemq-osgi/${activemq-version}$overwrite=merge&amp;Import-Package=org.springframework.*;resolution:=optional;version="[5,6)",*;resolution:=optional</bundle>
     <bundle>mvn:org.apache.camel/camel-activemq/${project.version}</bundle>
   </feature>
   <feature name='camel-ahc' version='${project.version}' start-level='50'>