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 73d9a56 Move usage of spring-registry packages to new coordinates
73d9a56 is described below
commit 73d9a56363271241d79054aa053c00ad8fd17af5
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Nov 16 21:19:32 2019 +0100
Move usage of spring-registry packages to new coordinates
---
pom.xml | 12 ++++++------
.../redback-authentication-ldap/pom.xml | 5 +++++
.../src/test/resources/META-INF/spring-context.xml | 2 +-
.../redback-authentication-users/pom.xml | 5 +++++
.../redback-authorization-rbac/pom.xml | 5 +++++
redback-common/redback-common-ldap/pom.xml | 5 +++++
.../common/ldap/connection/LdapConnectionConfiguration.java | 2 +-
.../redback/common/ldap/role/DefaultLdapRoleMapper.java | 2 +-
.../common/ldap/role/DefaultLdapRoleMapperConfiguration.java | 2 +-
.../archiva/redback/common/ldap/user/LdapUserMapper.java | 2 +-
.../src/test/resources/spring-context-role-mapper.xml | 2 +-
.../src/test/resources/ldap-spring-test.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../redback-keys-providers/redback-keys-cached/pom.xml | 5 +++++
.../src/test/resources/spring-context.xml | 2 +-
.../redback-rbac-providers/redback-rbac-cached/pom.xml | 5 +++++
.../src/test/resources/spring-context.xml | 2 +-
redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml | 5 +++++
.../redback-rbac-jpa/src/test/resources/spring-context.xml | 2 +-
.../redback-rbac-ldap/src/test/resources/spring-context.xml | 2 +-
.../redback-rbac-providers/redback-rbac-memory/pom.xml | 5 +++++
.../src/test/resources/spring-context.xml | 2 +-
redback-rbac/redback-rbac-role-manager/pom.xml | 5 +++++
.../src/test/resources/jpox-spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
redback-system/pom.xml | 7 ++++++-
redback-system/src/test/resources/spring-context.xml | 2 +-
.../redback-users-providers/redback-users-cached/pom.xml | 5 +++++
.../redback-users-providers/redback-users-jpa/pom.xml | 6 ++++++
.../redback-users-jpa/src/test/resources/spring-context.xml | 2 +-
.../redback-users-providers/redback-users-memory/pom.xml | 7 ++++++-
31 files changed, 91 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a86767..0a9f2d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,14 +342,14 @@
<version>${archiva.comp.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.registry</groupId>
- <artifactId>spring-registry-api</artifactId>
- <version>${redback.comp.spring-registry.version}</version>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-api</artifactId>
+ <version>${archiva.comp.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.registry</groupId>
- <artifactId>spring-registry-commons</artifactId>
- <version>${redback.comp.spring-registry.version}</version>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <version>${archiva.comp.version}</version>
</dependency>
<!-- Other -->
<dependency>
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
index 68a84b8..23ad85c 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
@@ -56,6 +56,11 @@
<artifactId>redback-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
index a4ca7dd..c32048f 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
@@ -68,7 +68,7 @@
</bean>
- <bean name="registry#commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ <bean name="registry#commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
</bean>
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
index 1e9d968..21ab06e 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
@@ -51,6 +51,11 @@
<artifactId>redback-users-cached</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
diff --git
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
index 2ec65b1..085692f 100644
---
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -66,6 +66,11 @@
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
diff --git a/redback-common/redback-common-ldap/pom.xml
b/redback-common/redback-common-ldap/pom.xml
index cef9ac3..56656d1 100644
--- a/redback-common/redback-common-ldap/pom.xml
+++ b/redback-common/redback-common-ldap/pom.xml
@@ -43,6 +43,11 @@
<artifactId>redback-users-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
diff --git
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
index 5eeb7d9..bf7c72a 100644
---
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
+++
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnectionConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.common.ldap.connection;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
diff --git
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
index 8cfffc3..22092b1 100644
---
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
+++
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
@@ -28,7 +28,7 @@ import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
index d5e344e..3dd27e5 100644
---
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
+++
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapperConfiguration.java
@@ -23,7 +23,7 @@ import com.google.common.collect.Multimap;
import org.apache.archiva.redback.common.ldap.MappingException;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
index cc0bcb8..5542c36 100644
---
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
+++
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
@@ -24,7 +24,7 @@ import
org.apache.archiva.redback.common.ldap.MappingException;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
import org.apache.archiva.redback.users.User;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
diff --git
a/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
b/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
index f8cba35..72cacfe 100755
---
a/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
+++
b/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
@@ -31,7 +31,7 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
<alias name="userManager#mock" alias="userManager#default"/>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
<property name="properties">
<value>
diff --git
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
index 1e9a98b..d612b87 100644
---
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
+++
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
@@ -31,7 +31,7 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
<property name="properties">
<value>
diff --git
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index ed79866..c867763 100644
---
a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++
b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@ -32,7 +32,7 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
<property name="properties">
<value>
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 af16c74..0965593 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -51,6 +51,11 @@
<artifactId>redback-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
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 8732f46..7d81c68 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
@@ -32,7 +32,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
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 0833f2d..7048d4e 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -55,6 +55,11 @@
<artifactId>spring-cache-ehcache</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
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 b0d6d50..ec35ab5 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
@@ -35,7 +35,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
index 1fb235d..d9adc5d 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
@@ -44,6 +44,11 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
index 2b51c2e..01c0671 100644
---
a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
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 b39b36c..376a520 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
@@ -67,7 +67,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
<property name="properties">
<value>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
index 1ae227e..0d0fe55 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
@@ -47,6 +47,11 @@
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
diff --git
a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
index 82d44ed..43963f2 100755
---
a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml
b/redback-rbac/redback-rbac-role-manager/pom.xml
index 9d02910..f28aa3c 100644
--- a/redback-rbac/redback-rbac-role-manager/pom.xml
+++ b/redback-rbac/redback-rbac-role-manager/pom.xml
@@ -40,6 +40,11 @@
<version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
<version>20060502</version>
diff --git
a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
index 72609b4..4422a76 100644
---
a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
+++
b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
@@ -49,7 +49,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
diff --git
a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
index a1edde5..9d72abe 100755
---
a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
+++
b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index 2a3f98f..c1a82d9 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -65,7 +65,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
diff --git a/redback-system/src/test/resources/spring-context.xml
b/redback-system/src/test/resources/spring-context.xml
index 4e5625e..a0da0f1 100644
--- a/redback-system/src/test/resources/spring-context.xml
+++ b/redback-system/src/test/resources/spring-context.xml
@@ -59,7 +59,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
</bean>
<alias name="commons-configuration" alias="test-conf"/>
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 51bb4bd..07cdfd0 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -47,6 +47,11 @@
<artifactId>spring-cache-ehcache</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
diff --git a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
index a9a6f0d..6c3b505 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
@@ -51,6 +51,12 @@
<artifactId>redback-common-jpa</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
diff --git
a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
index e3aa79c..813c557 100644
---
a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
+++
b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
@@ -35,7 +35,7 @@
<property name="registry" ref="test-conf"/>
</bean>
- <bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
+ <bean name="commons-configuration"
class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">
<value>
<