From 638bb213ef96646a3857615bd8ab3a0684f08bdf Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Fri, 15 Nov 2019 17:55:26 +0100
Subject: [PATCH] Dependency cleanup and switch to new archiva component
 coordinates

---
 pom.xml                                        | 18 ++++++------------
 .../redback-authentication-ldap/pom.xml        | 11 ++---------
 redback-common/redback-common-ldap/pom.xml     |  4 ++--
 .../redback-rest/redback-rest-services/pom.xml |  4 ++--
 .../redback/keys/jpa/JpaKeyManager.java        |  2 +-
 .../redback/users/jpa/JpaUserManager.java      |  4 ++--
 .../redback-users-ldap/pom.xml                 |  4 ++--
 7 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index ddd04965..8cd34c25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,15 +359,9 @@
         <version>2.7.5</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.archiva.redback.components</groupId>
-        <artifactId>expression-evaluator</artifactId>
-        <version>${redback.comp.expression-evaluator.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>org.apache.archiva.components</groupId>
+        <artifactId>archiva-components-expression-evaluator</artifactId>
+        <version>${archiva.comp.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.redback.components.registry</groupId>
@@ -556,9 +550,9 @@
       </dependency>
       -->
       <dependency>
-        <groupId>org.apache.archiva.redback.components</groupId>
-        <artifactId>spring-apacheds</artifactId>
-        <version>${redback.comp.spring-apacheds.version}</version>
+        <groupId>org.apache.archiva.components</groupId>
+        <artifactId>archiva-components-spring-apacheds</artifactId>
+        <version>${archiva.comp.version}</version>
       </dependency>
       <!--
       <dependency>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
index 7f97c27d..68a84b84 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
@@ -32,7 +32,6 @@
 
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
-    <apacheds.version>1.5.1</apacheds.version>
   </properties>
 
   <dependencies>
@@ -75,16 +74,10 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core</artifactId>
-      <version>${apacheds.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
-      <groupId>org.apache.archiva.redback.components</groupId>
-      <artifactId>spring-apacheds</artifactId>
+      <groupId>org.apache.archiva.components</groupId>
+      <artifactId>archiva-components-spring-apacheds</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/redback-common/redback-common-ldap/pom.xml b/redback-common/redback-common-ldap/pom.xml
index 7cd89532..cef9ac3d 100644
--- a/redback-common/redback-common-ldap/pom.xml
+++ b/redback-common/redback-common-ldap/pom.xml
@@ -74,8 +74,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components</groupId>
-      <artifactId>spring-apacheds</artifactId>
+      <groupId>org.apache.archiva.components</groupId>
+      <artifactId>archiva-components-spring-apacheds</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 0f07320b..7c2c7337 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -213,8 +213,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.archiva.redback.components</groupId>
-      <artifactId>spring-apacheds</artifactId>
+      <groupId>org.apache.archiva.components</groupId>
+      <artifactId>archiva-components-spring-apacheds</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java b/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
index 6d2affdc..4c2b98c7 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
+++ b/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
@@ -21,7 +21,7 @@ import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.apache.archiva.redback.keys.jpa.model.JpaAuthenticationKey;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java b/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
index d9c3cae0..4f9b12c8 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-jpa/src/main/java/org/apache/archiva/redback/users/jpa/JpaUserManager.java
@@ -28,7 +28,7 @@ import org.apache.archiva.redback.users.UserManagerException;
 import org.apache.archiva.redback.users.UserNotFoundException;
 import org.apache.archiva.redback.users.UserQuery;
 import org.apache.archiva.redback.users.jpa.model.JpaUser;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -289,7 +289,7 @@ public class JpaUserManager extends AbstractUserManager {
                     " is not an instance of " + JpaUser.class.getName() );
         }
 
-        if ( org.codehaus.plexus.util.StringUtils.isEmpty( user.getUsername() ) )
+        if ( StringUtils.isEmpty( user.getUsername() ) )
         {
             throw new IllegalStateException(
                     Messages.getString( "user.manager.cannot.add.user.without.username" ) ); //$NON-NLS-1$
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 88a3c2e3..d2deb513 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -92,8 +92,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.archiva.redback.components</groupId>
-      <artifactId>spring-apacheds</artifactId>
+      <groupId>org.apache.archiva.components</groupId>
+      <artifactId>archiva-components-spring-apacheds</artifactId>
       <scope>test</scope>
     </dependency>