use spring cache from apache namespace

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311980 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 89eb9548cc0aba960fcb05748f745ec1e0d9013b..d1f366679c9defa35a6c84f5caaa108b6ab81b09 100644 (file)
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -46,7 +46,7 @@
       <artifactId>spring-asm</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-api</artifactId>
       <exclusions>
         <exclusion>
@@ -56,7 +56,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
       <exclusions>
         <exclusion>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 3454fc63f116f9d3fcc841aa05204754af51f4f6..d5f888ae4128e7c5d68d3d60fd87016df13f9521 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -474,7 +474,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
       <exclusions>
         <exclusion>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 1f26b5892599733b4c5ca7fee56fd3b52e3c273c..6131929b674236fb6a7d16f840f6e6e9ae6bc7f9 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -440,7 +440,7 @@
       <artifactId>spring-registry-commons</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-api</artifactId>
     </dependency>
     <dependency>
@@ -448,7 +448,7 @@
       <artifactId>spring-jdo2</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
       <exclusions>
         <exclusion>

diff --git a/pom.xml b/pom.xml
index 98d585f6f71e6f4e02407a09c3bbc31d263486ee..f8677db32ed7bd6178c15a90bdfe0ff00bf69990 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <maven.indexer.version>4.1.3-SNAPSHOT</maven.indexer.version>
     <wagon.version>2.2</wagon.version>
     <redback.version>2.0-SNAPSHOT</redback.version>
-    <redback.cache.version>1.0</redback.cache.version>
+    <redback.cache.version>2.0-SNAPSHOT</redback.cache.version>
     <redback.quartz.version>1.0</redback.quartz.version>
     <redback.registry.version>1.0</redback.registry.version>
     <redback.spring-utils.version>1.0</redback.spring-utils.version>
@@ -838,12 +838,12 @@
         <version>${plexus-utils.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.redback.components.cache</groupId>
+        <groupId>org.apache.archiva.redback.components.cache</groupId>
         <artifactId>spring-cache-api</artifactId>
         <version>${redback.cache.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.redback.components.cache</groupId>
+        <groupId>org.apache.archiva.redback.components.cache</groupId>
         <artifactId>spring-cache-ehcache</artifactId>
         <version>${redback.cache.version}</version>
       </dependency>