You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/05/07 09:04:15 UTC
svn commit: r1334891 - in /cxf/trunk:
osgi/karaf/features/src/main/resources/features.xml rt/ws/security/pom.xml
Author: ffang
Date: Mon May 7 07:04:14 2012
New Revision: 1334891
URL: http://svn.apache.org/viewvc?rev=1334891&view=rev
Log:
[CXF-4278]remove ehcache bundle from cxf feature.xml as it's compile time dependency only since CXF 2.6
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/rt/ws/security/pom.xml
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1334891&r1=1334890&r2=1334891&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Mon May 7 07:04:14 2012
@@ -135,7 +135,6 @@
<feature version="${project.version}">cxf-ws-policy</feature>
<feature version="${cxf.wss4j.version}">wss4j</feature>
<feature version="${project.version}">cxf-ws-addr</feature>
- <bundle start-level='40' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
</feature>
<feature name="http-whiteboard" version="2.2.5" resolver='(obr)'>
@@ -333,8 +332,6 @@
<feature name="cxf-sts" version="${project.version}" resolver='(obr)'>
<bundle start-level='40' dependency="true">mvn:com.hazelcast/hazelcast/${cxf.hazelcast.version}</bundle>
- <bundle start-level='40' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${cxf.ehcache.bundle.version}</bundle>
-
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-ws-security</feature>
Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1334891&r1=1334890&r2=1334891&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Mon May 7 07:04:14 2012
@@ -33,7 +33,7 @@
</parent>
<properties>
<cxf.osgi.import>
- net.sf.ehcache*;resolution:=optional,
+ net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
</cxf.osgi.import>
</properties>