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.git
The following commit(s) were added to refs/heads/master by this push:
new 8fc6cdd Cleanup of dependencies for core-consumers
8fc6cdd is described below
commit 8fc6cdd37af5efd569a8ea3f8417289cd39275d6
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Feb 1 18:22:48 2020 +0100
Cleanup of dependencies for core-consumers
---
.../src/test/resources/log4j2-test.xml | 24 ++--
.../src/test/resources/log4j2-test.xml | 24 ++--
.../src/test/resources/log4j2-test.xml | 24 ++--
.../archiva-consumers/archiva-consumer-api/pom.xml | 15 +--
.../functors/ConsumerWantsFilePredicate.java | 6 +-
.../src/test/resources/log4j2-test.xml | 24 ++--
.../archiva-core-consumers/pom.xml | 135 ++++++++++++++++-----
.../src/test/resources/log4j2-test.xml | 88 ++------------
.../src/test/resources/log4j2-test.xml | 24 ++--
.../src/test/resources/log4j2-test.xml | 21 ++--
.../src/test/resources/log4j2-test.xml | 24 ++--
.../src/test/resources/log4j2-test.xml | 28 ++---
.../plugins/metadata-store-file/pom.xml | 4 -
status-dep.txt | 4 +
14 files changed, 228 insertions(+), 217 deletions(-)
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-checksum/src/test/resources/log4j2-test.xml
similarity index 69%
copy from
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
copy to
archiva-modules/archiva-base/archiva-checksum/src/test/resources/log4j2-test.xml
index 282cfa5..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-checksum/src/test/resources/log4j2-test.xml
@@ -17,25 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-
<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- </appenders>
- <loggers>
-
- <logger name="org.springframework" level="error"/>
-
<!--
- <logger name="org.apache.http" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
- <root level="info">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-common/src/test/resources/log4j2-test.xml
similarity index 69%
copy from
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
copy to
archiva-modules/archiva-base/archiva-common/src/test/resources/log4j2-test.xml
index 282cfa5..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-common/src/test/resources/log4j2-test.xml
@@ -17,25 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-
<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- </appenders>
- <loggers>
-
- <logger name="org.springframework" level="error"/>
-
<!--
- <logger name="org.apache.http" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
- <root level="info">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j2-test.xml
similarity index 69%
copy from
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
copy to
archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j2-test.xml
index 282cfa5..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j2-test.xml
@@ -17,25 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-
<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- </appenders>
- <loggers>
-
- <logger name="org.springframework" level="error"/>
-
<!--
- <logger name="org.apache.http" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
- <root level="info">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index a9c22d3..d8b11cb 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -35,23 +35,24 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-repository-admin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
<artifactId>archiva-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-repository-layer</artifactId>
+ <artifactId>archiva-repository-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
index 583d5a1..6ee08b4 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
@@ -20,13 +20,13 @@ package org.apache.archiva.consumers.functors;
*/
import org.apache.archiva.common.utils.BaseFile;
+import org.apache.archiva.common.utils.PathUtil;
import org.apache.archiva.consumers.RepositoryContentConsumer;
import org.apache.archiva.repository.ManagedRepository;
import org.apache.archiva.repository.features.IndexCreationFeature;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.types.selectors.SelectorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -125,7 +125,7 @@ public class ConsumerWantsFilePredicate
{
for ( String pattern : excludes )
{
- if ( SelectorUtils.matchPath( pattern, relativePath,
isCaseSensitive ) )
+ if ( PathUtil.matchPath( pattern, relativePath,
isCaseSensitive ) )
{
// Definately does NOT WANT FILE.
return false;
@@ -166,7 +166,7 @@ public class ConsumerWantsFilePredicate
// Now test includes.
for ( String pattern : consumer.getIncludes( ) )
{
- if ( SelectorUtils.matchPath( pattern, relativePath,
isCaseSensitive ) )
+ if ( PathUtil.matchPath( pattern, relativePath, isCaseSensitive ) )
{
// Specifically WANTS FILE.
return true;
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/log4j2-test.xml
similarity index 69%
copy from
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
copy to
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/log4j2-test.xml
index 282cfa5..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/log4j2-test.xml
@@ -17,25 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-
<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- </appenders>
- <loggers>
-
- <logger name="org.springframework" level="error"/>
-
<!--
- <logger name="org.apache.http" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
- <root level="info">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 599130f..4fa36b2 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -34,10 +34,12 @@
<dependencies>
<!-- TODO: remove this hard dependency by using an event mechanism -->
+ <!--
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>audit</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
@@ -57,16 +59,6 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -76,12 +68,82 @@
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-metadata</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-plexus-bridge</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-storage-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-storage-fs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
<!-- test dependencies -->
+ <!-- This dependency is needed by openjpa -->
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -98,21 +160,20 @@
<version>${redback.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <scope>test</scope>
- </dependency>
+ <!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<scope>test</scope>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<scope>test</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -128,11 +189,13 @@
<artifactId>archiva-maven-repository</artifactId>
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<scope>test</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
@@ -170,11 +233,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-test-resources</artifactId>
<scope>test</scope>
@@ -189,6 +247,8 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- Components used in test spring configuration -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-mock</artifactId>
@@ -200,24 +260,13 @@
<scope>test</scope>
</dependency>
- <!-- Needed for JDK >= 9 -->
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>test</scope>
- </dependency>
-
+ <!--
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
+ -->
</dependencies>
<build>
<pluginManagement>
@@ -266,4 +315,24 @@
</plugin>
</plugins>
</build>
+
+ <!--
+The jaxb dependency is needed by the enunciate plugin starting with JDK9.
+Adding to the plugin dependency is not sufficient, so I have to add it as
project dependency.
+Using provided scope to avoid adding it to packaging.
+-->
+ <profiles>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
index 2625d6f..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/log4j2-test.xml
@@ -17,87 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
+<configuration>
+ <Properties>
-
-<configuration status="debug">
-
- <properties>
- <property name="logsDirectory">${sys:appserver.base}/logs</property>
- </properties>
-
+ </Properties>
<appenders>
- <Console name="console" target="SYSTEM_OUT" level="info">
- <!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/-->
- <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level
%logger{36} - %msg%n}" />
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- <RollingRandomAccessFile name="rolling"
fileName="${logsDirectory}/archiva.log"
- filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log"
-
- immediateFlush="true" append="true">
- <PatternLayout>
- <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
- </PatternLayout>
- <Policies>
- <TimeBasedTriggeringPolicy />
- </Policies>
- </RollingRandomAccessFile>
- </appenders>
- <loggers>
-
- <!-- apache httpclient debug content transfer-->
- <!--
- <logger name="org.apache.http.wire">
- <level value="debug"/>
- </logger>
- <logger name="org.apache.http.headers" level="debug"/>
- -->
-
-
-
- <logger
name="org.apache.archiva.indexer.maven.search.MavenRepositorySearch"
level="info"/>
-
- <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils"
level="info"/>
-
- <logger name="JPOX" level="error"/>
-
- <logger
name="org.apache.commons.configuration.DefaultConfigurationBuilder"
level="error"/>
-
- <logger name="org.apache.archiva.admin.repository.managed" level="info"/>
-
- <logger name="org.springframework" level="info"/>
-
- <logger name="org.codehaus.plexus" level="info"/>
-
- <logger name="org.codehaus.redback" level="info"/>
-
- <logger name="org.apache.cxf" level="info"/>
-
- <logger name="org.quartz" level="info"/>
-
- <logger name="org.apache.archiva.indexer.merger" level="info"/>
-
- <logger
name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager"
level="debug" />
-
- <logger
name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler"
level="debug"/>
-
- <logger name="org.apache.archiva.web.security.ArchivaAuthorizer"
level="debug"/>
-
- <logger
name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService"
level="debug"/>
-
- <logger
name="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
level="debug"/>
-
- <logger name="org.apache.archiva.components.taskqueue.DefaultTaskQueue"
level="info" />
-
- <logger name="org.apache.archiva" level="debug" />
<!--
- <logger name="org.apache.archiva.scheduler.indexing" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
-
- <root level="info" includeLocation="true">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
- <appender-ref ref="rolling"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
index 282cfa5..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
@@ -17,25 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-
<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- </appenders>
- <loggers>
-
- <logger name="org.springframework" level="error"/>
-
<!--
- <logger name="org.apache.http" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
- <root level="info">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-filelock/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-filelock/src/test/resources/log4j2-test.xml
index f915e53..03547df 100644
---
a/archiva-modules/archiva-base/archiva-filelock/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-filelock/src/test/resources/log4j2-test.xml
@@ -16,19 +16,26 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
--->
-<configuration status="debug">
+ -->
+<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level
%logger{36} - %msg%n}" />
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
+ <!--
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
+ -->
</appenders>
<loggers>
- <logger name="org.apache.archiva.common.filelock" level="info"/>
- <root level="info" includeLocation="true">
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j2-test.xml
similarity index 69%
copy from
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
copy to
archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j2-test.xml
index 282cfa5..03547df 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j2-test.xml
@@ -17,25 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-
<configuration>
+ <Properties>
+
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
- </appenders>
- <loggers>
-
- <logger name="org.springframework" level="error"/>
-
<!--
- <logger name="org.apache.http" level="debug"/>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
-->
- <root level="info">
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git
a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j2-test.xml
b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j2-test.xml
index 3919a98..03547df 100644
---
a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j2-test.xml
+++
b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j2-test.xml
@@ -17,29 +17,25 @@
~ specific language governing permissions and limitations
~ under the License.
-->
+<configuration>
+ <Properties>
-
-<configuration status="debug">
+ </Properties>
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/>
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
</Console>
+ <!--
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3}
- %msg%n"/>
+ </RandomAccessFile>
+ -->
</appenders>
<loggers>
-
- <logger name="org.apache.archiva.admin.repository.managed" level="debug"/>
- <logger name="org.apache.archiva.repository" level="TRACE" />
-
- <logger name="JPOX" level="error"/>
-
-
- <logger name="org.springframework" level="error"/>
-
-
- <root level="info">
+ <logger name="org.apache.archiva" level="info"/>
+ <logger name="org.apache.archiva.repository.scanner" level="info"/>
+ <root level="error" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
</configuration>
-
-
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml
b/archiva-modules/plugins/metadata-store-file/pom.xml
index 4c4c42c..6df5ceb 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -59,10 +59,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
diff --git a/status-dep.txt b/status-dep.txt
index b7f561d..57e5042 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -17,6 +17,10 @@ archiva-modules
archiva-repository-layer
archiva-proxy-api
archiva-proxy
+ archiva-repository-scanner
+ archiva-security-common
+ archiva-consumers
+ archiva-consumers-api
