Cleanup of authorization deps
diff --git a/redback-authorization/pom.xml b/redback-authorization/pom.xml
index fded320..ba310d1 100644
--- a/redback-authorization/pom.xml
+++ b/redback-authorization/pom.xml
@@ -31,12 +31,6 @@
<properties>
<site.staging.base>${project.parent.basedir}</site.staging.base>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-users-api</artifactId>
- </dependency>
- </dependencies>
<modules>
<module>redback-authorization-api</module>
<module>redback-authorization-providers</module>
diff --git a/redback-authorization/redback-authorization-api/pom.xml b/redback-authorization/redback-authorization-api/pom.xml
index ad4eb9f..d554a30 100644
--- a/redback-authorization/redback-authorization-api/pom.xml
+++ b/redback-authorization/redback-authorization-api/pom.xml
@@ -33,4 +33,11 @@
</properties>
<name>Redback :: Authorization API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-api</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
index 4d779f8..a1a38e6 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
@@ -40,12 +40,18 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
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 397ef92..bedf397 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -42,25 +42,7 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-cached</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-memory</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-users-configurable</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-users-memory</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-model</artifactId>
@@ -72,14 +54,45 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
<dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-configurable</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-cached</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-memory</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-memory</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<scope>test</scope>