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 d7c3dbe771aed0a71c49d7ba29051b8ce3b6777e Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Sep 1 20:09:48 2019 +0200 Removing maven-artifact-manager dependency --- .../archiva-maven/archiva-maven-repository/pom.xml | 4 ---- .../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 5 +++++ pom.xml | 12 ------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index b2bdcc8..214e9f4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -99,10 +99,6 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> </dependency> <dependency> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 0ad5958..8cd80f2 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -62,6 +62,10 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-filelock</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-indexing</artifactId> <exclusions> <exclusion> @@ -420,6 +424,7 @@ <scope>provided</scope> </dependency> + <!-- Needed for JDK >= 9 --> <dependency> <groupId>javax.annotation</groupId> diff --git a/pom.xml b/pom.xml index 6785065..f79014c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,6 @@ <commons-lang.version>2.6</commons-lang.version> <maven3x.version>3.5.4</maven3x.version> - <maven.artifact-manager.version>2.2.1</maven.artifact-manager.version> <maven.compat.version>3.0</maven.compat.version> <maven.resolver.version>1.1.1</maven.resolver.version> <sonatype.aether.version>1.13.1</sonatype.aether.version> @@ -899,17 +898,6 @@ <artifactId>maven-artifact</artifactId> <version>${maven3x.version}</version> </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - <version>${maven.artifact-manager.version}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency>
