Cleaning up dependencies of redback-configuration

redback-configuration/pom.xml

@@ -39,37 +39,27 @@
       <artifactId>archiva-components-expression-evaluator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.components.registry</groupId>
-      <artifactId>spring-registry-api</artifactId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva.redback.components.registry</groupId>
+      <groupId>org.apache.archiva.components.registry</groupId>
-      <artifactId>spring-registry-commons</artifactId>
+      <artifactId>archiva-components-spring-registry-commons</artifactId>
-      <exclusions>
+      <scope>test</scope>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>   
     <dependency>
-      <groupId>org.slf4j</groupId>
+      <groupId>org.springframework</groupId>
-      <artifactId>slf4j-simple</artifactId>
+      <artifactId>spring-context</artifactId>
-      <scope>test</scope>
+    </dependency>
-    </dependency>   
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
@@ -77,9 +67,23 @@
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jcl</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>

redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java

@@ -23,8 +23,8 @@
 import org.apache.archiva.components.evaluator.EvaluatorException;
 import org.apache.archiva.components.evaluator.ExpressionEvaluator;
 import org.apache.archiva.components.evaluator.sources.SystemPropertyExpressionSource;
-import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.components.registry.Registry;
-import org.apache.archiva.redback.components.registry.RegistryException;
+import org.apache.archiva.components.registry.RegistryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java

@@ -18,9 +18,6 @@
  * under the License.
  */
 
-import org.apache.archiva.redback.components.registry.RegistryException;
-
-import javax.annotation.PostConstruct;
 import java.util.Collection;
 import java.util.List;
 

redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java

@@ -20,7 +20,7 @@
  */
 
 import junit.framework.TestCase;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

redback-configuration/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.configuration" level="info" />
+
+    <root level="error" includeLocation="true">
+      <appender-ref ref="console"/>
+    </root>
+  </loggers>
+</configuration>
+
+