Fix for JDK11 dependencies

2020-07-05 00:32:28 +02:00 · 2020-07-05 00:32:28 +02:00 · 3c452c38f2
parent ab874fecc9
commit 3c452c38f2
11 changed files with 77 additions and 7 deletions
--- 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>
--- 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 );
    }

--- 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
@ -0,0 +1,36 @@
+<?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
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<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>
+
+
--- 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
    // ----------------------------------------------------------------------
--- 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>
--- 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>
@ -109,8 +117,6 @@
        <dependency>
          <groupId>jakarta.xml.bind</groupId>
          <artifactId>jakarta.xml.bind-api</artifactId>
-          <version>2.3.0</version>
-          <scope>provided</scope>
        </dependency>
      </dependencies>
    </profile>
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@ -412,8 +412,6 @@
        <dependency>
          <groupId>jakarta.xml.bind</groupId>
          <artifactId>jakarta.xml.bind-api</artifactId>
-          <version>2.3.0</version>
-          <scope>provided</scope>
        </dependency>
      </dependencies>
    </profile>
--- 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>
--- 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>
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@ -48,6 +48,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.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
--- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
@ -55,6 +55,10 @@
      <groupId>jakarta.transaction</groupId>
      <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>