Author: dkulp
Date: Wed Mar 14 21:11:29 2012
New Revision: 1300720
URL: http://svn.apache.org/viewvc?rev=1300720&view=rev
Log:
Open up the cxf version range a bit to allow testing with CXF 2.6.0
Use newer version of joda-time that is already an OSGi bundle
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1300720&r1=1300719&r2=1300720&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Mar 14 21:11:29 2012
@@ -63,9 +63,9 @@
<feature name='camel-cxf' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<feature>jetty</feature>
- <feature version='[2.4,2.6)'>cxf</feature>
+ <feature version='[2.4,2.7)'>cxf</feature>
<!-- Added cxf-specs feature to workaround the karaf feature validate
issue -->
- <feature version='[2.4,2.6)'>cxf-specs</feature>
+ <feature version='[2.4,2.7)'>cxf-specs</feature>
<bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle>
</feature>
@@ -419,7 +419,7 @@
<bundle dependency='true'>mvn:org.jibx/jibx-run/${jibx-version}</bundle>
<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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:joda-time/joda-time/${jodatime-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>
@@ -782,7 +782,7 @@
<bundle
dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:joda-time/joda-time/${jodatime-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>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2-bundle-version}</bundle>
