From d7c3dbe771aed0a71c49d7ba29051b8ce3b6777e Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 1 Sep 2019 20:09:48 +0200
Subject: [PATCH] Removing maven-artifact-manager dependency

---
 .../archiva-maven/archiva-maven-repository/pom.xml   |  4 ----
 .../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 b2bdcc8ed..214e9f4b3 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -97,10 +97,6 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository-metadata</artifactId>
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 0ad5958e8..8cd80f2e7 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
@@ -60,6 +60,10 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-filelock</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-scheduler-indexing</artifactId>
@@ -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 6785065ea..f79014cc0 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>
-- 
2.39.5