You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/12/24 10:50:14 UTC
[archiva-redback-core] 04/04: Cleanup of authorization deps
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
commit 8b40e98999e342f3a6fb15c98a3b4a1cfbcc8a26
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue Dec 24 11:50:04 2019 +0100
Cleanup of authorization deps
---
redback-authorization/pom.xml | 6 ----
.../redback-authorization-api/pom.xml | 7 ++++
.../redback-authorization-open/pom.xml | 10 ++++--
.../redback-authorization-rbac/pom.xml | 39 ++++++++++++++--------
4 files changed, 41 insertions(+), 21 deletions(-)
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,43 +42,56 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-cached</artifactId>
+ <artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-memory</artifactId>
+ <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</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-users-memory</artifactId>
- <scope>test</scope>
+ <artifactId>redback-rbac-cached</artifactId>
+ <scope>runtime</scope>
</dependency>
+
+
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-model</artifactId>
+ <artifactId>redback-rbac-memory</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.registry</groupId>
- <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <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>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>