summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-11-22 03:38:23 +0000
committerOlivier Lamy <olamy@apache.org>2013-11-22 03:38:23 +0000
commit483019e90e61e607fea763670e7bcbb78a699666 (patch)
treeea73bf6766a0a6c9d7f39d2321b49d602d607c30
parentad24c19bf126c5aee3afcc466cf0c9869a60c926 (diff)
downloadarchiva-483019e90e61e607fea763670e7bcbb78a699666.tar.gz
archiva-483019e90e61e607fea763670e7bcbb78a699666.zip
upgrade ehcache version
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1544402 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--pom.xml10
-rw-r--r--redback-keys/redback-keys-providers/redback-keys-cached/pom.xml2
-rw-r--r--redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml2
-rw-r--r--redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml2
-rw-r--r--redback-users/redback-users-providers/redback-users-cached/pom.xml2
5 files changed, 9 insertions, 9 deletions
diff --git a/pom.xml b/pom.xml
index 47b4aac88..84eb00562 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
index e0ce3fea4..eb2288aea 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -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>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
index 2933ca7b5..e5e4e5a1b 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
index e3302a7c5..d5aca6b80 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml b/redback-users/redback-users-providers/redback-users-cached/pom.xml
index c0181267f..b28df77b5 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>