Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dependency cleanup

This commit is contained in:
Martin Stockhammer 2020-06-16 13:43:38 +02:00
parent 9a2860b467
commit bb0bc93d80
9 changed files with 104 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View File

@ -65,5 +65,6 @@
<defaultValue>${wagon.version}</defaultValue> <defaultValue>${wagon.version}</defaultValue>
</requiredProperty> </requiredProperty>
</requiredProperties> </requiredProperties>
</archetype-descriptor> </archetype-descriptor>

13
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
View File

@ -41,6 +41,7 @@
<archiva.comp.version>${archivaCompVersion}</archiva.comp.version> <archiva.comp.version>${archivaCompVersion}</archiva.comp.version>
<commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version> <commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version>
<maven.wagon.version>${mavenWagonVersion}</maven.wagon.version> <maven.wagon.version>${mavenWagonVersion}</maven.wagon.version>
<archiva.comp.version>${archivaCompVersion}</archiva.comp.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -70,6 +71,18 @@
</dependency> </dependency>
<!-- Test scope --> <!-- Test scope -->
<dependency>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-spring-quartz</artifactId>
<version>${archiva.comp.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<version>${archivaVersion}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId> <artifactId>wagon-http</artifactId>

15
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -119,6 +119,16 @@
<!-- test dependencies --> <!-- test dependencies -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-spring-quartz</artifactId>
<scope>test</scope>
</dependency>
<!-- This dependency is needed by openjpa --> <!-- This dependency is needed by openjpa -->
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>javax.persistence</groupId>
@ -244,11 +254,6 @@
<artifactId>redback-common-test-resources</artifactId> <artifactId>redback-common-test-resources</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>

15
archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml
View File

@ -93,6 +93,21 @@
</dependency> </dependency>
<!-- Test scope --> <!-- Test scope -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-spring-quartz</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId> <artifactId>wagon-http</artifactId>

119
archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml
View File

@ -51,21 +51,44 @@
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy-api</artifactId> <artifactId>archiva-proxy-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.maven</groupId> <groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-common</artifactId> <artifactId>archiva-maven-common</artifactId>
</dependency> </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-filelock</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-beans</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -74,25 +97,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>wagon-provider-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>guava</artifactId> <artifactId>wagon-http-shared</artifactId>
</dependency> </dependency>
<!--
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</exclusion>
</exclusions>
</dependency>
-->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
@ -101,10 +113,7 @@
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-reader</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.indexer</groupId> <groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>
@ -120,29 +129,8 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-plexus-bridge</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
</dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
@ -150,6 +138,21 @@
<!-- TEST Scope --> <!-- TEST Scope -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId> <artifactId>javax.persistence-api</artifactId>
@ -199,6 +202,7 @@
<dependency> <dependency>
<groupId>org.apache.archiva.maven</groupId> <groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-repository</artifactId> <artifactId>archiva-maven-repository</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
@ -212,11 +216,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva.redback</groupId> <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-memory</artifactId> <artifactId>redback-keys-memory</artifactId>
@ -251,20 +250,13 @@
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId> <artifactId>wagon-http-lightweight</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.sonatype.sisu</groupId> <groupId>org.sonatype.sisu</groupId>
@ -294,11 +286,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

5
archiva-modules/archiva-web/archiva-security/pom.xml
View File

@ -111,6 +111,11 @@
</dependency> </dependency>
<!-- Test Scoped --> <!-- Test Scoped -->
<dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId> <artifactId>javax.persistence-api</artifactId>

5
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

@ -152,6 +152,11 @@
</dependency> </dependency>
<!-- TEST Scope --> <!-- TEST Scope -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.persistence</groupId> <groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId> <artifactId>javax.persistence-api</artifactId>

1
status-dep.txt
View File

@ -44,6 +44,7 @@ archiva-modules
archiva-maven-metadata archiva-maven-metadata
archiva-maven-model archiva-maven-model
archiva-maven-proxy archiva-maven-proxy
archiva-maven-indexer