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 71196f3 Dependency cleanup of rss
71196f3 is described below
commit 71196f3125dd747898966b9908afef047604a1a9
Author: Martin Stockhammer <[email protected]>
AuthorDate: Thu Jun 25 22:41:56 2020 +0200
Dependency cleanup of rss
---
archiva-modules/archiva-web/archiva-rss/pom.xml | 82 +++++++++++++++-------
.../src/test/resources}/log4j2-test.xml | 19 ++---
.../archiva-webapp/src/test/log4j2-test.xml | 6 +-
status-dep.txt | 3 +
4 files changed, 67 insertions(+), 43 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml
b/archiva-modules/archiva-web/archiva-rss/pom.xml
index 4c84df1..048f269 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<artifactId>archiva-web</artifactId>
<groupId>org.apache.archiva</groupId>
@@ -42,12 +43,17 @@
<artifactId>metadata-repository-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>com.rometools</groupId>
@@ -91,35 +97,61 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.archiva.components.cache</groupId>
- <artifactId>archiva-components-spring-cache-ehcache</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/test/repositories/test-repo/**</exclude>
+ <exclude>src/test/repositories/snapshot-repo/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reuseForks>false</reuseForks>
+ <!--
+ <argLine>-Xms1024m -Xmx2048m -server -XX:MaxPermSize=256m
@{jacocoproperty}</argLine>
+ -->
+ <argLine>-Xms512m -Xmx1024m -server -XX:MaxPermSize=256m</argLine>
+ <systemPropertyVariables>
+
<appserver.base>${project.build.directory}/appserver-base</appserver.base>
+
<plexus.home>${project.build.directory}/appserver-base</plexus.home>
+
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+
<archiva.user.configFileName>${basedir}/target/archiva.xml</archiva.user.configFileName>
+
<test.resources.path>${project.build.testOutputDirectory}</test.resources.path>
+ <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
+
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+ <basedir>${basedir}</basedir>
+ <expectedVersion>${project.version}</expectedVersion>
+ <archiva.logMissingI18n>true</archiva.logMissingI18n>
+ <java.awt.headless>true</java.awt.headless>
+
<archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
+ <openjpa.Log>${openjpa.Log}</openjpa.Log>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
b/archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml
similarity index 78%
copy from archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
copy to
archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml
index 6aec440..e539b74 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml
@@ -19,14 +19,14 @@
-->
-<configuration status="debug">
+<configuration status="info">
<properties>
- <property name="logsDirectory">${sys:appserver.base}/logs</property>
+ <property
name="logsDirectory">${sys:appserver.base:-target}/logs</property>
</properties>
<appenders>
- <Console name="console" target="SYSTEM_OUT" level="info">
+ <Console name="console" target="SYSTEM_OUT" >
<!--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>
@@ -74,25 +74,14 @@
<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"/>
-->
<root level="info" includeLocation="true">
- <appender-ref ref="console"/>
+ <appender-ref ref="console" level="error" />
<appender-ref ref="rolling"/>
</root>
</loggers>
diff --git
a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
index 6aec440..e36a83f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml
@@ -22,11 +22,11 @@
<configuration status="debug">
<properties>
- <property name="logsDirectory">${sys:appserver.base}/logs</property>
+ <property
name="logsDirectory">${sys:appserver.base:-target}/logs</property>
</properties>
<appenders>
- <Console name="console" target="SYSTEM_OUT" level="info">
+ <Console name="console" target="SYSTEM_OUT" >
<!--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>
@@ -92,7 +92,7 @@
-->
<root level="info" includeLocation="true">
- <appender-ref ref="console"/>
+ <appender-ref ref="console" level="error" />
<appender-ref ref="rolling"/>
</root>
</loggers>
diff --git a/status-dep.txt b/status-dep.txt
index 9c0428a..0603ef8 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -61,6 +61,9 @@ archiva-modules
archiva-web
archiva-rest
archiva-rest-api
+ archiva-rest-services
+ archiva-web-common
+ archiva-rss
