From 48f24b2b5d413b79f2fc1fac359f3c9efb562286 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Tue, 24 Dec 2019 11:34:50 +0100
Subject: [PATCH] Cleanup authentication dependencies and moving version
 numbers to parent pom

---
 pom.xml                                          | 12 ++++++------
 .../redback-authentication-open/pom.xml          | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 27805689..26d3d96f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,7 +339,7 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.2</version>
+        <version>${commons.logging.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.components.cache</groupId>
@@ -354,7 +354,7 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>2.10.6</version>
+        <version>${ehcache.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.components</groupId>
@@ -385,18 +385,18 @@
       <dependency>
         <groupId>commons-digester</groupId>
         <artifactId>commons-digester</artifactId>
-        <version>1.8.1</version>
+        <version>${commons.digester.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.4</version>
+        <version>${commons.io.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <!-- commons-configuration requires this version. -->
-        <version>3.2</version>
+        <version>${commons.collections.3.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
@@ -436,7 +436,7 @@
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>2.3.2</version>
+        <version>${hsqldb.version}</version>
         <scope>test</scope>
       </dependency>
       <!-- spring -->
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
index 0b84ce06..babb0f3a 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
@@ -38,14 +38,24 @@
       <groupId>org.apache.archiva.redback</groupId>
       <artifactId>redback-authentication-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-policy</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-    </dependency>   
+      <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>