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 98995f96..d33c2fc2 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml @@ -64,6 +64,10 @@ jakarta.inject jakarta.inject-api + + jakarta.annotation + jakarta.annotation-api + org.springframework diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java index e668f841..aad15906 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java @@ -22,6 +22,7 @@ package org.apache.archiva.redback.authentication.ldap; import junit.framework.TestCase; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.common.ldap.connection.LdapException; import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder; import org.apache.archiva.redback.users.ldap.service.LdapCacheService; @@ -210,6 +211,11 @@ public class LdapBindAuthenticatorTest attributes.put( "mail", "foo" ); attributes.put( "userPassword", passwordEncoder.encodePassword( "foo" ) ); attributes.put( "givenName", "foo" ); + try { + context.destroySubcontext( dn ); + } catch ( Exception e ) { + // + } context.createSubcontext( dn, attributes ); } diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/log4j2-test.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000..d3c88166 --- /dev/null +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/log4j2-test.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java index 2340cc5e..6c7a5c51 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java @@ -72,6 +72,10 @@ public class ConfigurableLdapConnectionFactory @Named(value = "userConfiguration#default") private UserConfiguration userConf; + public ConfigurableLdapConnectionFactory() { + + } + // ---------------------------------------------------------------------- // Component Lifecycle // ---------------------------------------------------------------------- diff --git a/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml b/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml index c7490985..04312f96 100644 --- a/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml +++ b/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml @@ -28,6 +28,6 @@ default-lazy-init="true"> - + \ No newline at end of file diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml b/redback-integrations/redback-rest/redback-rest-api/pom.xml index 806886db..d0dcd95e 100644 --- a/redback-integrations/redback-rest/redback-rest-api/pom.xml +++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml @@ -58,6 +58,14 @@ jakarta.ws.rs jakarta.ws.rs-api + + jakarta.annotation + jakarta.annotation-api + + + jakarta.inject + jakarta.inject-api +