Author: olamy
Date: Fri Nov 22 03:38:23 2013
New Revision: 1544402
URL: http://svn.apache.org/r1544402
Log:
upgrade ehcache version
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml
Modified: archiva/redback/redback-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Fri Nov 22 03:38:23 2013
@@ -332,17 +332,17 @@
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.6.5</version>
+ <artifactId>ehcache</artifactId>
+ <version>2.7.4</version>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
@@ -761,7 +761,7 @@
<exclude>org.codehaus.plexus:plexus-jdo2</exclude>
<exclude>org.codehaus.plexus:plexus-apacheds</exclude>
<exclude>org.codehaus.plexus:plexus-velocity</exclude>
- <exclude>net.sf.ehcache:ehcache</exclude>
+ <exclude>net.sf.ehcache:ehcache-core</exclude>
<exclude>velocity:velocity</exclude>
<exclude>stax:stax-api</exclude>
</excludes>
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
Fri Nov 22 03:38:23 2013
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
Fri Nov 22 03:38:23 2013
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
Fri Nov 22 03:38:23 2013
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml?rev=1544402&r1=1544401&r2=1544402&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/pom.xml
Fri Nov 22 03:38:23 2013
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
