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 66d860d4cfcf0cb2da3ca36e09cb85fa9f070376 Author: Martin Stockhammer <[email protected]> AuthorDate: Thu Oct 10 18:44:43 2019 +0200 Cleaning up dependencies of ldap authentication --- redback-authentication/pom.xml | 4 ---- .../redback-authentication-ldap/pom.xml | 17 +++++++++++------ .../authentication/ldap/LdapBindAuthenticator.java | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/redback-authentication/pom.xml b/redback-authentication/pom.xml index e2163e4..36a32e4 100644 --- a/redback-authentication/pom.xml +++ b/redback-authentication/pom.xml @@ -32,10 +32,6 @@ </properties> <dependencies> <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-users-api</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </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 3701753..7f97c27 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml @@ -53,12 +53,8 @@ <artifactId>redback-users-ldap</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-configuration</artifactId> </dependency> <dependency> <groupId>javax.inject</groupId> @@ -67,6 +63,15 @@ <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> </dependency> diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java index fedae34..9c33ffd 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java @@ -26,7 +26,7 @@ import org.apache.archiva.redback.common.ldap.user.UserMapper; import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult;
