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 316874dc90b309475f9c35aab671cfb35e1a46a8 Author: Martin Stockhammer <[email protected]> AuthorDate: Mon Sep 2 18:13:55 2019 +0200 Removing sonatype aether dependency --- .../archiva-maven/archiva-maven-converter/pom.xml | 13 ----------- archiva-modules/archiva-web/archiva-webapp/pom.xml | 17 --------------- pom.xml | 25 +--------------------- 3 files changed, 1 insertion(+), 54 deletions(-) diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml index 1330941..b52d47b 100644 --- a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml @@ -51,19 +51,6 @@ </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-impl</artifactId> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - </dependency> - - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-checksum</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 38aa011..0fa1b14 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -281,23 +281,6 @@ </dependency> <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-impl</artifactId> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-connector-file</artifactId> - </dependency> - - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <exclusions> diff --git a/pom.xml b/pom.xml index 916b1d7..61ea6c6 100644 --- a/pom.xml +++ b/pom.xml @@ -57,10 +57,9 @@ <maven3x.version>3.5.4</maven3x.version> <maven.resolver.version>1.1.1</maven.resolver.version> - <sonatype.aether.version>1.13.1</sonatype.aether.version> + <maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version> <maven-model-converter.version>2.1</maven-model-converter.version> - <maven.indexer.version>6.0.1-SNAPSHOT</maven.indexer.version> <wagon.version>3.0.0</wagon.version> <redback.version>3.0.0-SNAPSHOT</redback.version> <redback.cache.version>2.2</redback.cache.version> @@ -939,28 +938,6 @@ <version>${maven.resolver.version}</version> </dependency> - <!-- Sonatype aether --> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-api</artifactId> - <version>${sonatype.aether.version}</version> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-impl</artifactId> - <version>${sonatype.aether.version}</version> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-util</artifactId> - <version>${sonatype.aether.version}</version> - </dependency> - <dependency> - <groupId>org.sonatype.aether</groupId> - <artifactId>aether-connector-file</artifactId> - <version>${sonatype.aether.version}</version> - </dependency> - <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>expression-evaluator</artifactId>
