This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
The following commit(s) were added to refs/heads/master by this push:
new 5a080e5 Switching to moved component-spring-cache module
5a080e5 is described below
commit 5a080e52e5e57442a30492a04a779519fe645b19
Author: Martin Stockhammer <[email protected]>
AuthorDate: Tue Nov 19 23:36:13 2019 +0100
Switching to moved component-spring-cache module
---
pom.xml | 14 +++++++-------
.../src/test/resources/spring-context.xml | 2 +-
.../redback-rest-api/src/enunciate/enunciate.xml | 21 +++++++++++++--------
.../redback/rest/services/DefaultUserService.java | 2 +-
.../redback-keys-cached/pom.xml | 8 ++++----
.../redback/keys/cached/CachedKeyManager.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../redback-rbac-cached/pom.xml | 8 ++++----
.../redback/rbac/cached/CachedRbacManager.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 14 +++++++-------
.../src/test/resources/spring-context.xml | 4 ++--
.../redback-rbac-ldap/pom.xml | 8 ++++----
.../archiva/redback/rbac/ldap/LdapRbacManager.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 4 ++--
.../redback-users-cached/pom.xml | 8 ++++----
.../redback/users/cached/CachedUserManager.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../redback-users-ldap/pom.xml | 8 ++++----
.../users/ldap/service/DefaultLdapCacheService.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 4 ++--
23 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0a9f2d1..1086ef3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,19 +322,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
- <version>${redback.comp.spring-cache.version}</version>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
+ <version>${archiva.comp.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
- <version>${redback.comp.spring-cache.version}</version>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <version>${archiva.comp.version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
- <version>2.7.5</version>
+ <version>2.10.6</version>
</dependency>
<dependency>
<groupId>org.apache.archiva.components</groupId>
diff --git
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
index e6921a6..341647b 100644
---
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
+++
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
<alias name="userManager#memory" alias="userManager#jpa"/>
- <bean name="cache#users"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#users"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git
a/redback-integrations/redback-rest/redback-rest-api/src/enunciate/enunciate.xml
b/redback-integrations/redback-rest/redback-rest-api/src/enunciate/enunciate.xml
index 0f364c8..8ec4946 100644
---
a/redback-integrations/redback-rest/redback-rest-api/src/enunciate/enunciate.xml
+++
b/redback-integrations/redback-rest/redback-rest-api/src/enunciate/enunciate.xml
@@ -17,24 +17,29 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-2.0.0.xsd";>
-
- <services>
- <rest defaultRestSubcontext="redbackServices"/>
- </services>
+<enunciate
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.12.0.xsd";>
+ <title>Apache Archiva Redback REST API</title>
<modules>
+ <jaxrs>
+ <application path="redbackServices" />
+ </jaxrs>
<cxf disabled="false"/>
- <jersey disabled="true" />
+ <jersey disabled="true"/>
<c disabled="true"/>
<csharp disabled="true"/>
<obj-c disabled="true"/>
<jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/>
+ <jaxon1 disabled="true"/>
+ <jackson1 disabled="true"/>
+ <java-json-client disabled="true"/>
- <docs disabled="false" title="Apache Archiva Redback REST API"
includeExampleXml="true" includeExampleJson="true"
- includeDefaultDownloads="false" docsSubdir=""
freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
css="${project.basedir}/src/enunciate/archiva.css">
+ <docs disabled="false"
+ docsSubdir=""
freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
css="${project.basedir}/src/enunciate/archiva.css">
<!-- <war docsDir="apidocs" /> -->
</docs>
diff --git
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 56cef7d..f5d0b17 100644
---
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.rest.services;
import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.authentication.AuthenticationException;
import
org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import
org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
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 0965593..eb77110 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -39,12 +39,12 @@
<artifactId>redback-keys-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
diff --git
a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
index b21d80a..bd0fa6e 100644
---
a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
+++
b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.keys.cached;
* under the License.
*/
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.keys.AbstractKeyManager;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager;
diff --git
a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
index 6933659..e81c27d 100644
---
a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
+++
b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.keys.cached"/>
- <bean name="cache#keys"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#keys"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git
a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index 7d81c68..8369a25 100644
---
a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++
b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
<alias name="commons-configuration" alias="test-conf"/>
- <bean name="cache#keys"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#keys"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
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 7048d4e..07a7cfd 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -47,12 +47,12 @@
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
index cbcb9b8..01bbc50 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.rbac.cached;
* under the License.
*/
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
index f24140f..b1054ca 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.rbac.cached"/>
- <bean name="cache#operations"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#operations"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -42,7 +42,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#permissions"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#permissions"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -53,7 +53,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#resources"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#resources"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -64,7 +64,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#roles"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#roles"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -75,7 +75,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#effectiveRoleSet"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#effectiveRoleSet"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -90,7 +90,7 @@
Caches with Short Term entries
================================================================ -->
- <bean name="cache#userAssignments"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userAssignments"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -101,7 +101,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
- <bean name="cache#userPermissions"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userPermissions"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index ec35ab5..ec89f4f 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -51,7 +51,7 @@
<property name="userPermissionsCache" ref="cache#userPermissions"/>
</bean>
- <bean name="cache#userAssignments"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userAssignments"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -62,7 +62,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
- <bean name="cache#userPermissions"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userPermissions"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
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 0d65781..624a1de 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
@@ -47,12 +47,12 @@
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
index 435b827..f31d00c 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
@@ -25,7 +25,7 @@ import
org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapper;
import org.apache.archiva.redback.common.ldap.role.LdapRoleMapperConfiguration;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.rbac.AbstractRBACManager;
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
index 645d863..731ff22 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.rbac.ldap"/>
- <bean name="cache#ldapRoles"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#ldapRoles"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
index efa7bae..aa24113 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
@@ -95,10 +95,10 @@
<property name="userPermissionsCache" ref="cache#userPermissions"/>
</bean>
- <bean name="cache#userAssignments"
class="org.apache.archiva.redback.components.cache.impl.NoCacheCache">
+ <bean name="cache#userAssignments"
class="org.apache.archiva.components.cache.impl.NoCacheCache">
</bean>
- <bean name="cache#userPermissions"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userPermissions"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
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 07cdfd0..7d605af 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -39,12 +39,12 @@
<artifactId>redback-policy</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
diff --git
a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
index 506bdb9..ebf4238 100644
---
a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
+++
b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.users.cached;
* under the License.
*/
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserManagerListener;
diff --git
a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
index 36320c0..fce2e30 100644
---
a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.users.cached"/>
- <bean name="cache#users"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#users"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git
a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
index 48d2deb..712339e 100644
---
a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
<alias name="userManager#memory" alias="userManager#configurable"/>
- <bean name="cache#users"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#users"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
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 d2deb51..f2c80ad 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -52,12 +52,12 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
diff --git
a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
index 5f55a90..8768c54 100644
---
a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
+++
b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/service/DefaultLdapCacheService.java
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.users.ldap.service;
*/
import org.apache.archiva.redback.common.ldap.user.LdapUser;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
diff --git
a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
index ac1384c..996107d 100644
---
a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
@@ -33,7 +33,7 @@
<!-- REDBACK-289/MRM-1488 -->
<!-- Cache for LDAP users. Data is refreshed every 3 mins. -->
- <bean name="cache#ldapUser"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
+ <bean name="cache#ldapUser"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="180"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -46,7 +46,7 @@
</bean>
<!-- Cache for users' LDAP userDn. Data is refreshed every 3 mins. -->
- <bean name="cache#ldapUserDn"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
+ <bean name="cache#ldapUserDn"
class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="180"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
