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
commit bb0bc93d802209089a4e32abf7749f1f69f4a244 Author: Martin Stockhammer <[email protected]> AuthorDate: Tue Jun 16 13:43:38 2020 +0200 Dependency cleanup --- .../META-INF/maven/archetype-metadata.xml | 1 + .../resourcesstatic/archetype-resources/pom.xml | 13 +++ .../projects/compile/archetype.properties | 2 +- .../archiva-core-consumers/pom.xml | 15 ++- .../archiva-indexer-consumers/pom.xml | 15 +++ .../archiva-maven/archiva-maven-indexer/pom.xml | 111 +++++++++------------ .../archiva-web/archiva-security/pom.xml | 5 + archiva-modules/archiva-web/archiva-webdav/pom.xml | 5 + status-dep.txt | 1 + 9 files changed, 100 insertions(+), 68 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index c817006..cab8970 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -65,5 +65,6 @@ <defaultValue>${wagon.version}</defaultValue> </requiredProperty> + </requiredProperties> </archetype-descriptor> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index 00d8bf6..3224bb4 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -41,6 +41,7 @@ <archiva.comp.version>${archivaCompVersion}</archiva.comp.version> <commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version> <maven.wagon.version>${mavenWagonVersion}</maven.wagon.version> + <archiva.comp.version>${archivaCompVersion}</archiva.comp.version> </properties> <dependencies> <dependency> @@ -71,6 +72,18 @@ <!-- 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> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> <version>${maven.wagon.version}</version> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties index d9b8f3c..8296e74 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties @@ -33,4 +33,4 @@ httpclientVersion=${httpclient.version} httpcoreVersion=${httpclient.core.version} archivaCompVersion=${archiva.comp.version} beanUtilsVersion=${commons.beanutils.version} -mavenWagonVersion=${wagon.version} \ No newline at end of file +mavenWagonVersion=${wagon.version} 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 9a4fe65..4fe1100 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 @@ -119,6 +119,16 @@ <!-- 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 --> <dependency> <groupId>javax.persistence</groupId> @@ -245,11 +255,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml index 4502c1d..2039955 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml @@ -94,6 +94,21 @@ <!-- 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> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml index bcf7dec..82eac7f 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml @@ -51,21 +51,44 @@ <groupId>org.apache.archiva</groupId> <artifactId>archiva-proxy-api</artifactId> </dependency> + + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-common</artifactId> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-proxy</artifactId> + <artifactId>archiva-storage-api</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva.maven</groupId> - <artifactId>archiva-maven-common</artifactId> + <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> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> + <artifactId>spring-beans</artifactId> </dependency> <dependency> @@ -74,25 +97,14 @@ </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-provider-api</artifactId> </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> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-shared</artifactId> </dependency> - --> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -101,10 +113,7 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven.indexer</groupId> - <artifactId>indexer-reader</artifactId> - </dependency> + <dependency> <groupId>org.apache.maven.indexer</groupId> <artifactId>indexer-core</artifactId> @@ -120,36 +129,30 @@ </exclusion> </exclusions> </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> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> + + + <!-- TEST Scope --> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-plexus-bridge</artifactId> + <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>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> </dependency> - - - <!-- TEST Scope --> <dependency> <groupId>javax.persistence</groupId> <artifactId>javax.persistence-api</artifactId> @@ -199,6 +202,7 @@ <dependency> <groupId>org.apache.archiva.maven</groupId> <artifactId>archiva-maven-repository</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -213,11 +217,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-keys-memory</artifactId> <scope>test</scope> @@ -251,20 +250,13 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http-lightweight</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-configuration</artifactId> - </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> + <scope>test</scope> <exclusions> <exclusion> <groupId>org.sonatype.sisu</groupId> @@ -294,11 +286,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 7d37d5b..b212b0f 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -112,6 +112,11 @@ <!-- Test Scoped --> <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-repository</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>javax.persistence-api</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index bf8809a..fcadafd 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -153,6 +153,11 @@ <!-- TEST Scope --> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-repository</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>javax.persistence-api</artifactId> <scope>test</scope> diff --git a/status-dep.txt b/status-dep.txt index 3170d6e..2e663c5 100644 --- a/status-dep.txt +++ b/status-dep.txt @@ -44,6 +44,7 @@ archiva-modules archiva-maven-metadata archiva-maven-model archiva-maven-proxy + archiva-maven-indexer
