You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/03/28 04:49:44 UTC

svn commit: r1306128 - in /cxf/branches/2.5.x-fixes: osgi/karaf/features/src/main/resources/features.xml parent/pom.xml

Author: ningjiang
Date: Wed Mar 28 02:49:44 2012
New Revision: 1306128

URL: http://svn.apache.org/viewvc?rev=1306128&view=rev
Log:
CXF-1636 updated the features file

Modified:
    cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml
    cxf/branches/2.5.x-fixes/parent/pom.xml

Modified: cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1306128&r1=1306127&r2=1306128&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/karaf/features/src/main/resources/features.xml Wed Mar 28 02:49:44 2012
@@ -112,6 +112,7 @@
         <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
         <bundle start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
         <bundle start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
+        <bundle start-level='20' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
 
         <feature version='${project.version}'>cxf-jaxb</feature>
         <feature version="[2,3)">http</feature>

Modified: cxf/branches/2.5.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1306128&r1=1306127&r2=1306128&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Wed Mar 28 02:49:44 2012
@@ -127,6 +127,7 @@
         <cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
         <cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
         <cxf.ehcache.version>2.5.1</cxf.ehcache.version>
+        <cxf.ehcache.bundle.version>2.5.1_1-SNAPSHOT</cxf.ehcache.bundle.version>
         
         <!-- various OSGi related versions -->
         <cxf.aries.version>0.3.1</cxf.aries.version>