Author: dkulp
Date: Thu May 19 14:54:41 2011
New Revision: 1124876
URL: http://svn.apache.org/viewvc?rev=1124876&view=rev
Log:
[CXF-3537] Update features file to support multiple karaf versions.
Patch from Jean-Baptiste Onofre applied.
Modified:
cxf/trunk/distribution/karaf/features/pom.xml
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
Modified: cxf/trunk/distribution/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/pom.xml?rev=1124876&r1=1124875&r2=1124876&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/pom.xml (original)
+++ cxf/trunk/distribution/karaf/features/pom.xml Thu May 19 14:54:41 2011
@@ -132,6 +132,8 @@
<profiles>
<profile>
+ <!-- this profile doesn't work right now. Requires an update to
the features plugin. -->
+ <!-- See https://issues.apache.org/jira/browse/KARAF-651 -->
<id>validate</id>
<build>
<plugins>
Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1124876&r1=1124875&r2=1124876&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
(original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Thu
May 19 14:54:41 2011
@@ -17,7 +17,6 @@
limitations under the License.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";
name="cxf-${project.version}">
-
<repository>mvn:org.apache.karaf.assemblies.features/standard/${cxf.karaf.version}/xml/features</repository>
<feature name="cxf-specs" version="${project.version}">
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
@@ -83,8 +82,8 @@
<bundle
start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
<feature version='${cxf.jaxb.bundle.version}'>cxf-jaxb</feature>
- <feature version="${cxf.karaf.version}">http</feature>
- <feature version="${cxf.karaf.version}">war</feature>
+ <feature version="[2,3)">http</feature>
+ <feature version="[2,3)">war</feature>
<feature version="${cxf.spring.version}">spring</feature>
<feature version="${cxf.spring.osgi.version}">spring-dm</feature>
<feature version="${cxf.spring.version}">spring-jms</feature>
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1124876&r1=1124875&r2=1124876&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu May 19 14:54:41 2011
@@ -114,7 +114,6 @@
<!-- various OSGi related versions -->
<cxf.aries.version>0.3</cxf.aries.version>
<cxf.osgi.version>4.2.0</cxf.osgi.version>
- <cxf.karaf.version>2.2.1</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
<cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
