mirror of https://github.com/apache/archiva.git
Dependency cleanup of rss
This commit is contained in:
Martin Stockhammer
parent
33d4958f10
commit
71196f3125
|
|
@ -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>
|
||||
|
|
@ -90,36 +96,62 @@
|
|||
<artifactId>easymock</artifactId>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,90 @@
|
|||
<?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 status="info">
|
||||
|
||||
<properties>
|
||||
<property name="logsDirectory">${sys:appserver.base:-target}/logs</property>
|
||||
</properties>
|
||||
|
||||
<appenders>
|
||||
<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>
|
||||
<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.components.taskqueue.DefaultTaskQueue" level="info" />
|
||||
|
||||
<!--
|
||||
<logger name="org.apache.archiva.scheduler.indexing" level="debug"/>
|
||||
-->
|
||||
|
||||
<root level="info" includeLocation="true">
|
||||
<appender-ref ref="console" level="error" />
|
||||
<appender-ref ref="rolling"/>
|
||||
</root>
|
||||
</loggers>
|
||||
</configuration>
|
||||
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ archiva-modules
|
|||
archiva-web
|
||||
archiva-rest
|
||||
archiva-rest-api
|
||||
archiva-rest-services
|
||||
archiva-web-common
|
||||
archiva-rss
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue