diff --git a/pom.xml b/pom.xml
index b92de69d..9c37e857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -497,14 +497,14 @@
         <version>1.9</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.redback.components.cache</groupId>
+        <groupId>org.apache.archiva.redback.components.cache</groupId>
         <artifactId>spring-cache-api</artifactId>
-        <version>1.0</version>
+        <version>2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.redback.components.cache</groupId>
+        <groupId>org.apache.archiva.redback.components.cache</groupId>
         <artifactId>spring-cache-ehcache</artifactId>
-        <version>1.0</version>
+        <version>2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
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 8b54c4c3..22d6e55e 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -33,11 +33,11 @@
       <artifactId>redback-keys-api</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>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
     </dependency>
     <dependency>
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 6d2a9dbc..f8ecabe2 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -40,11 +40,11 @@
       <artifactId>redback-rbac-model</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>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
     </dependency>
     <dependency>
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 e666e18d..7ee4d0f2 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -33,11 +33,11 @@
       <artifactId>redback-policy</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>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
     </dependency>
     <dependency>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
index 9be3be29..7756da06 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -48,11 +48,11 @@
       <artifactId>spring-context-support</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>
-      <groupId>org.codehaus.redback.components.cache</groupId>
+      <groupId>org.apache.archiva.redback.components.cache</groupId>
       <artifactId>spring-cache-ehcache</artifactId>
     </dependency>
     <dependency>