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 3c452c3 Fix for JDK11 dependencies
3c452c3 is described below
commit 3c452c38f276aca81296f12735359b090f430158
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Jul 5 00:32:28 2020 +0200
Fix for JDK11 dependencies
---
.../redback-authentication-ldap/pom.xml | 4 +++
.../ldap/LdapBindAuthenticatorTest.java | 6 +++++
.../src/test/resources/log4j2-test.xml | 31 ++++++++++++----------
.../ConfigurableLdapConnectionFactory.java | 4 +++
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../redback-rest/redback-rest-api/pom.xml | 12 ++++++---
.../redback-rest/redback-rest-services/pom.xml | 4 +--
.../redback-rbac-cached/pom.xml | 4 +++
redback-system/pom.xml | 4 +++
.../redback-users-cached/pom.xml | 4 +++
.../redback-users-jpa/pom.xml | 4 +++
11 files changed, 58 insertions(+), 21 deletions(-)
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 98995f9..d33c2fc 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 @@
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
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 e668f84..aad1590 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-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/log4j2-test.xml
similarity index 55%
copy from
redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml
copy to
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/log4j2-test.xml
index c749098..d3c8816 100644
---
a/redback-common/redback-common-ldap/src/main/resources/META-INF/spring-context.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/log4j2-test.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -18,16 +17,20 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
- default-lazy-init="true">
+<configuration>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.redback.authentication" level="info"
/>
+
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
- <context:annotation-config />
- <context:component-scan
base-package="org.apache.archiva.redback.common.ldap"/>
-
-</beans>
\ No newline at end of file
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 2340cc5..6c7a5c5 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 c749098..04312f9 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">
<context:annotation-config />
- <context:component-scan
base-package="org.apache.archiva.redback.common.ldap"/>
+ <context:component-scan
base-package="org.apache.archiva.redback.common.ldap,org.apache.archiva.redback.common.ldap.connection"/>
</beans>
\ 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 806886d..d0dcd95 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 @@
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
<!-- normally not needed but here for wadl feature currently in cxf -->
<!--
<dependency>
@@ -108,9 +116,7 @@
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml
b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 45ac45b..d668224 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -411,9 +411,7 @@
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
index 6e1fb7d..071b5dc 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -56,6 +56,10 @@
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index 6f9a313..a3be487 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -64,6 +64,10 @@
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml
b/redback-users/redback-users-providers/redback-users-cached/pom.xml
index ad1d5e6..4fa5108 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -49,6 +49,10 @@
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
index ba7a090..2032192 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
@@ -56,6 +56,10 @@
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
