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 2020/01/12 10:17:17 UTC

[archiva-redback-core] branch master updated: Integration dependency cleanup

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 68b9af1  Integration dependency cleanup
68b9af1 is described below

commit 68b9af1697c6815187b0ca2f94401dc3367b4bdf
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Dec 25 19:15:47 2019 +0100

    Integration dependency cleanup
---
 pom.xml                                            |  2 +
 .../redback-common-integrations/pom.xml            | 44 +++++++++++++---------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index d440092..2377627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,8 @@
 
     <javax.servlet.version>4.0.1</javax.servlet.version>
 
+    <jacksonVersion>2.9.10</jacksonVersion>
+
   </properties>
 
   <repositories>
diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml
index 11df83e..3b43bc5 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -59,6 +59,14 @@
       <artifactId>redback-authentication-ldap</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-authentication-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-users-api</artifactId>
+    </dependency>
     <!-- Keys Management / Authentication -->
     <dependency>
       <groupId>org.apache.archiva.redback</groupId>
@@ -72,11 +80,23 @@
     <!-- RBAC Management / Authorization -->
     <dependency>
       <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-common-ldap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
       <artifactId>redback-authorization-rbac</artifactId>
       <scope>runtime</scope>
     </dependency> 
     <dependency>
       <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-authorization-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-rbac-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
       <artifactId>redback-rbac-role-manager</artifactId>
     </dependency>
     <dependency>
@@ -98,22 +118,6 @@
       <groupId>org.apache.archiva.redback</groupId>
       <artifactId>redback-integrations-security</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.archiva.redback</groupId>
-      <artifactId>redback-authentication-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva.redback</groupId>
-      <artifactId>redback-users-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva.redback</groupId>
-      <artifactId>redback-rbac-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva.redback</groupId>
-      <artifactId>redback-authorization-api</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>javax.inject</groupId>
@@ -163,7 +167,7 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
-    </dependency>      
+    </dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -182,6 +186,11 @@
     </dependency>
 
     <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
@@ -190,6 +199,7 @@
       <artifactId>commons-io</artifactId>
     </dependency>
 
+
     <!-- === Test Dependencies ======================= -->
     <dependency>
       <groupId>org.springframework</groupId>