Author: dkulp
Date: Wed Aug 22 14:40:46 2012
New Revision: 1376076
URL: http://svn.apache.org/viewvc?rev=1376076&view=rev
Log:
Add ability to specify the cxf feature version separately
Use newly staged (and fixed) cxf 2.5.5.1 features file. Will need to copy
locally until release vote done.
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=1376076&r1=1376075&r2=1376076&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Wed Aug 22 14:40:46 2012
@@ -58,6 +58,7 @@
<commons-pool-version>1.5.6</commons-pool-version>
<concurrentlinkedhashmap.version>1.2</concurrentlinkedhashmap.version>
<cxf-version>2.5.5</cxf-version>
+ <cxf-features-version>2.5.5.1</cxf-features-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>
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=1376076&r1=1376075&r2=1376076&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 Aug 22 14:40:46 2012
@@ -18,7 +18,7 @@
-->
<features name='camel-${project.version}'>
-
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository>
+
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-features-version}/xml/features</repository>
<repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features</repository>
<feature name='xml-specs-api' version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'>
