From 8160004309c075d144bae74694b407bb3d562eb4 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin.stockhammer@ars.de>
Date: Mon, 29 Oct 2018 11:10:35 +0100
Subject: [PATCH] Changing deps from eclipse.aether to maven-resolver

---
 .../plugins/maven2-repository/pom.xml         | 15 ++++-----
 .../ArchivaRepositoryConnectorFactory.java    |  4 +--
 pom.xml                                       | 32 +++++++++++++++++++
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 5a8ef5f06..8d5a04c2a 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -98,18 +98,17 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-resolver-provider</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver</artifactId>
+      <type>pom</type>
     </dependency>
-
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-transport-file</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-connector-file</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-connector-basic</artifactId>
     </dependency>
 
     <dependency>
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java
index 612ed5d07..4ce243f98 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java
@@ -18,11 +18,11 @@ package org.apache.archiva.dependency.tree.maven2;
  * under the License.
  */
 
+import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.connector.file.FileRepositoryConnectorFactory;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.spi.connector.ArtifactDownload;
 import org.eclipse.aether.spi.connector.ArtifactUpload;
@@ -41,7 +41,7 @@ public class ArchivaRepositoryConnectorFactory
     implements RepositoryConnectorFactory
 {
 
-    private FileRepositoryConnectorFactory delegate = new FileRepositoryConnectorFactory();
+    private BasicRepositoryConnectorFactory delegate = new BasicRepositoryConnectorFactory();
 
     public ArchivaRepositoryConnectorFactory()
     {
diff --git a/pom.xml b/pom.xml
index e6991e506..b3b8fe4a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     <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>
     <eclipse.aether.version>0.9.0.M2</eclipse.aether.version>
 
@@ -396,6 +397,10 @@
             <groupId>org.sonatype.sisu</groupId>
             <artifactId>sisu-guice</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.apache.maven.resolver</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -903,6 +908,33 @@
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-resolver-provider</artifactId>
         <version>${maven3x.version}</version>
+        <type>pom</type>
+      </dependency>
+
+
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver</artifactId>
+        <version>${maven.resolver.version}</version>
+        <type>pom</type>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-transport-file</artifactId>
+        <version>${maven.resolver.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-connector-basic</artifactId>
+        <version>${maven.resolver.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-transport-http</artifactId>
+        <version>${maven.resolver.version}</version>
       </dependency>
 
       <!-- Eclipse aether -->
-- 
2.39.5