[camel] 02/02: Fixing up camel-jxpath in Karaf

[coheigea]

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

coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 41e0d78cfab152da47a57a0d2173fc0f261e0772
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jun 7 10:25:34 2019 +0100

    Fixing up camel-jxpath in Karaf
---
 parent/pom.xml                                           | 3 ++-
 platforms/karaf/features/src/main/resources/features.xml | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 27394d9..ea5ae9a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,7 +376,8 @@
     
<jclouds-google-guava-version-range>[18.0,19.0)</jclouds-google-guava-version-range>
     <jcommander-version>1.72</jcommander-version>
     <jcr-version>2.0</jcr-version>
-    <jdom-bundle-version>2.0.6_1</jdom-bundle-version>
+    <jdom-bundle-version>1.1_4</jdom-bundle-version>
+    <jdom2-bundle-version>2.0.6_1</jdom2-bundle-version>
     <jedis-client-version>2.9.0</jedis-client-version>
     <jedis-client-bundle-version>2.9.0_1</jedis-client-bundle-version>
     <jersey-version>2.11</jersey-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 4a4bb5b..d329917 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -314,8 +314,6 @@
     <feature version='${project.version}'>camel-core</feature>
          <feature>transaction</feature>
     <bundle 
dependency='true'>mvn:net.sf.ehcache/ehcache/${ehcache-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-cache/${project.version}</bundle>
   </feature>
   <feature name='camel-caffeine' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version="${project.version}">camel-core</feature>
@@ -951,8 +949,6 @@
     <bundle 
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
-    <bundle 
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-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.ant/${ant-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
@@ -1292,7 +1288,6 @@
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
   </feature>
   <feature name='camel-jing' version='${project.version}' resolver='(obr)' 
start-level='50'>
@@ -1399,6 +1394,7 @@
     <bundle 
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
+    <bundle 
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
   </feature>
   <feature name='camel-kafka' version='${project.version}' resolver='(obr)' 
start-level='50'>
@@ -2002,7 +1998,7 @@
   </feature>
   <feature name='camel-rss' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.version}'>camel-atom</feature>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom2-bundle-version}</bundle>
     <bundle dependency="true">mvn:com.rometools/rome/${rome-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-rss/${project.version}</bundle>
   </feature>