From 1ea40450096cc6500ed92051481ec8446e1e5044 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Thu, 10 Oct 2019 21:47:23 +0200
Subject: [PATCH] Fixing dependencies for subprojects

---
 pom.xml                                             |  4 ++--
 .../redback-authentication-users/pom.xml            |  4 ++++
 .../redback-authorization-rbac/pom.xml              |  5 +++++
 redback-common/redback-common-ldap/pom.xml          | 13 +++++++++++++
 redback-configuration/pom.xml                       |  6 ++++++
 redback-policy/pom.xml                              |  6 ++++++
 redback-rbac/redback-rbac-role-manager/pom.xml      |  5 +++++
 redback-system/pom.xml                              |  6 ++++++
 .../redback-users-jpa/pom.xml                       |  4 ++++
 .../redback-users-ldap/pom.xml                      |  6 ++++++
 10 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5366d80..eb45a57c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,12 +372,12 @@
       <dependency>
         <groupId>org.apache.archiva.redback.components.registry</groupId>
         <artifactId>spring-registry-api</artifactId>
-        <version>2.4</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.redback.components.registry</groupId>
         <artifactId>spring-registry-commons</artifactId>
-        <version>2.4</version>
+        <version>2.5-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
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 dc2d7911..1e9d9687 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
@@ -68,6 +68,10 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+    </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 203a88c1..2ec65b13 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -99,6 +99,11 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 
diff --git a/redback-common/redback-common-ldap/pom.xml b/redback-common/redback-common-ldap/pom.xml
index 835e34dd..7cd89532 100644
--- a/redback-common/redback-common-ldap/pom.xml
+++ b/redback-common/redback-common-ldap/pom.xml
@@ -58,6 +58,10 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -79,6 +83,15 @@
       <artifactId>redback-policy</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/redback-configuration/pom.xml b/redback-configuration/pom.xml
index 9bf13124..5ca54495 100644
--- a/redback-configuration/pom.xml
+++ b/redback-configuration/pom.xml
@@ -100,6 +100,12 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml
index 268c074a..530943f1 100644
--- a/redback-policy/pom.xml
+++ b/redback-policy/pom.xml
@@ -84,6 +84,12 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml b/redback-rbac/redback-rbac-role-manager/pom.xml
index 633534c0..42d06170 100644
--- a/redback-rbac/redback-rbac-role-manager/pom.xml
+++ b/redback-rbac/redback-rbac-role-manager/pom.xml
@@ -97,6 +97,11 @@
       <artifactId>redback-common-test-resources</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index 2c5b91e1..2a3f98f4 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -107,6 +107,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>
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 a8d45b65..a9a6f0da 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
@@ -50,6 +50,10 @@
       <groupId>org.apache.archiva.redback</groupId>
       <artifactId>redback-common-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa</artifactId>
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 d3fa26b7..88a3c2e3 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -85,6 +85,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-apacheds</artifactId>