Author: dkulp Date: Wed Jul 11 20:50:41 2012 New Revision: 1360390 URL: http://svn.apache.org/viewvc?rev=1360390&view=rev Log: Merged revisions 1360340 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1360340 | dkulp | 2012-07-11 14:32:44 -0400 (Wed, 11 Jul 2012) | 10 lines Merged revisions 1360339 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1360339 | dkulp | 2012-07-11 14:31:32 -0400 (Wed, 11 Jul 2012) | 2 lines Move cxf feature range to property to only need to set it in one place ........ ........ Modified: camel/branches/camel-2.9.x/parent/pom.xml camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1360390&r1=1360389&r2=1360390&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Wed Jul 11 20:50:41 2012 @@ -58,6 +58,7 @@ <commons-pool-version>1.5.6</commons-pool-version> <concurrentlinkedhashmap.version>1.2</concurrentlinkedhashmap.version> <cxf-version>2.5.4</cxf-version> + <cxf-version-range>[2.4,2.8)</cxf-version-range> <cxf-xjc-utils-version>2.4.0</cxf-xjc-utils-version> <derby-version>10.8.2.2</derby-version> <dnsjava-version>2.1.1</dnsjava-version> @@ -177,7 +178,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.12,0.13)", org.apache.abdera.*;version="[0.4,2)", org.apache.commons.httpclient.*;version="[3.1,4.0)", Modified: camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1360390&r1=1360389&r2=1360390&view=diff ============================================================================== --- camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml Wed Jul 11 20:50:41 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.7)'>cxf</feature> + <feature version='${cxf-version-range}'>cxf</feature> <!-- Added cxf-specs feature to workaround the karaf feature validate issue --> - <feature version='[2.4,2.7)'>cxf-specs</feature> + <feature version='${cxf-version-range}'>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>
