You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/07/11 20:31:32 UTC
svn commit: r1360339 - in /camel/trunk: parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: dkulp
Date: Wed Jul 11 18:31:32 2012
New Revision: 1360339
URL: http://svn.apache.org/viewvc?rev=1360339&view=rev
Log:
Move cxf feature range to property to only need to set it in one place
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1360339&r1=1360338&r2=1360339&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jul 11 18:31:32 2012
@@ -63,6 +63,7 @@
<commons-pool-version>1.6</commons-pool-version>
<concurrentlinkedhashmap.version>1.2</concurrentlinkedhashmap.version>
<cxf-version>2.6.1</cxf-version>
+ <cxf-version-range>[2.4,2.8)</cxf-version-range>
<cxf-xjc-utils-version>2.6.0</cxf-xjc-utils-version>
<derby-version>10.8.2.2</derby-version>
<dnsjava-version>2.1.1</dnsjava-version>
@@ -207,7 +208,7 @@
<camel.osgi.import.defaults>
org.springframework.*;version="[3,4)",
org.apache.commons.logging.*;version="[1.1,2)",
- org.apache.cxf.*;version="[2.4,2.8)",
+ org.apache.cxf.*;version="${cxf-version-range}",
org.apache.qpid.*;version="[0.14,1)",
org.apache.abdera.*;version="[0.4,2)",
org.apache.commons.httpclient.*;version="[3.1,4.0)",
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=1360339&r1=1360338&r2=1360339&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Jul 11 18:31:32 2012
@@ -73,13 +73,13 @@
<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.7)'>cxf</feature>
- <feature version='[2.4,2.7)'>cxf-specs</feature>
- <feature version='[2.4,2.7)'>cxf-core</feature>
- <feature version='[2.4,2.7)'>cxf-jaxrs</feature>
- <feature version='[2.4,2.7)'>cxf-jaxws</feature>
- <feature version='[2.4,2.7)'>cxf-databinding-jaxb</feature>
- <feature version='[2.4,2.7)'>cxf-bindings-soap</feature>
+ <feature version='${cxf-version-range}'>cxf</feature>
+ <feature version='${cxf-version-range}'>cxf-specs</feature>
+ <feature version='${cxf-version-range}'>cxf-core</feature>
+ <feature version='${cxf-version-range}'>cxf-jaxrs</feature>
+ <feature version='${cxf-version-range}'>cxf-jaxws</feature>
+ <feature version='${cxf-version-range}'>cxf-databinding-jaxb</feature>
+ <feature version='${cxf-version-range}'>cxf-bindings-soap</feature>
<bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle>