You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/12/13 07:30:54 UTC

svn commit: r1213574 - in /camel/branches/camel-2.7.x/platforms/karaf/features: pom.xml src/main/resources/features.xml

Author: ningjiang
Date: Tue Dec 13 06:30:54 2011
New Revision: 1213574

URL: http://svn.apache.org/viewvc?rev=1213574&view=rev
Log:
CAMEL-4772 Fixed the feature issue

Modified:
    camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
    camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml?rev=1213574&r1=1213573&r2=1213574&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml Tue Dec 13 06:30:54 2011
@@ -52,6 +52,7 @@
       <commons-lang-version>2.4</commons-lang-version>
       <commons-net-version>2.0</commons-net-version>
       <commons-management-version>1.0</commons-management-version>
+      <commons-pool-bundle-version>1.5.4_3</commons-pool-bundle-version>
       <dom4j-bundle-version>1.6.1_4</dom4j-bundle-version>
       <el-api-1.0-version>1.0.1</el-api-1.0-version>
       <fastinfoset-version>1.2.7_2</fastinfoset-version>

Modified: camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml?rev=1213574&r1=1213573&r2=1213574&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml Tue Dec 13 06:30:54 2011
@@ -48,6 +48,11 @@
     <bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
   </feature> 
   <feature name='cxf' version='${pom.version}' resolver='(obr)' start-level='50'>
+    <feature version="[3,4)">spring</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
     <bundle dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>