You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2013/07/18 17:51:06 UTC
svn commit: r1504504 - in /cxf/trunk:
osgi/karaf/features/src/main/resources/ parent/ rt/rs/security/sso/saml/
rt/ws/security/ services/sts/sts-core/ services/sts/sts-war/
services/sts/systests/advanced/ services/sts/systests/basic/
systests/ws-securit...
Author: ay
Date: Thu Jul 18 15:51:05 2013
New Revision: 1504504
URL: http://svn.apache.org/r1504504
Log:
[CXF-5134] Upgrade to ehcache 2.7.2
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/rs/security/sso/saml/pom.xml
cxf/trunk/rt/ws/security/pom.xml
cxf/trunk/services/sts/sts-core/pom.xml
cxf/trunk/services/sts/sts-war/pom.xml
cxf/trunk/services/sts/systests/advanced/pom.xml
cxf/trunk/services/sts/systests/basic/pom.xml
cxf/trunk/systests/ws-security-examples/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=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Thu Jul 18 15:51:05 2013
@@ -124,7 +124,7 @@
<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' dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
</feature>
<feature name="cxf-rt-security" version="${project.version}" resolver='(obr)'>
@@ -367,7 +367,7 @@
<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>
+ <bundle start-level='40' dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-ws-security</feature>
<bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Jul 18 15:51:05 2013
@@ -93,8 +93,7 @@
<cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
<cxf.commons-lang.version>2.6</cxf.commons-lang.version>
<cxf.derby.version>10.2.2.0</cxf.derby.version>
- <cxf.ehcache.version>2.5.1</cxf.ehcache.version>
- <cxf.ehcache.bundle.version>2.5.1_1</cxf.ehcache.bundle.version>
+ <cxf.ehcache.version>2.7.2</cxf.ehcache.version>
<cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
<cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
<cxf.httpcomponents.asyncclient.version>4.0-beta3</cxf.httpcomponents.asyncclient.version>
Modified: cxf/trunk/rt/rs/security/sso/saml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/sso/saml/pom.xml (original)
+++ cxf/trunk/rt/rs/security/sso/saml/pom.xml Thu Jul 18 15:51:05 2013
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
<scope>compile</scope>
</dependency>
Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Thu Jul 18 15:51:05 2013
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
<scope>compile</scope>
</dependency>
Modified: cxf/trunk/services/sts/sts-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/pom.xml (original)
+++ cxf/trunk/services/sts/sts-core/pom.xml Thu Jul 18 15:51:05 2013
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
<scope>provided</scope>
<optional>true</optional>
Modified: cxf/trunk/services/sts/sts-war/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/pom.xml (original)
+++ cxf/trunk/services/sts/sts-war/pom.xml Thu Jul 18 15:51:05 2013
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
</dependency>
<dependency>
Modified: cxf/trunk/services/sts/systests/advanced/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/pom.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/pom.xml Thu Jul 18 15:51:05 2013
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
</dependency>
<dependency>
Modified: cxf/trunk/services/sts/systests/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/pom.xml (original)
+++ cxf/trunk/services/sts/systests/basic/pom.xml Thu Jul 18 15:51:05 2013
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
</dependency>
<dependency>
Modified: cxf/trunk/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/pom.xml?rev=1504504&r1=1504503&r2=1504504&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/pom.xml (original)
+++ cxf/trunk/systests/ws-security-examples/pom.xml Thu Jul 18 15:51:05 2013
@@ -156,7 +156,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<version>${cxf.ehcache.version}</version>
</dependency>
<dependency>