From 807409d507ecf524cda065f1ec31892c46244801 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 26 Nov 2021 17:34:10 +0100
Subject: [PATCH] Update mvnd to include Maven Resolver 1.7 (#507)

As mvnd itself is Java8 lang level, it is completely
okay to up resolver to 1.7 (that is java8 as well).
The only reason why Maven 3.8.x CANNOT use resolver
1.7 is that it is still Java7 level.
---
 .../mvnd/sync/MvndSyncContextFactory.java     |  2 +-
 dist/src/main/provisio/maven-distro.xml       | 13 +++++++-
 pom.xml                                       | 33 ++++++++++++++++++-
 sync/pom.xml                                  |  2 --
 .../mvnd/sync/IpcSyncContextFactory.java      |  2 +-
 .../mvnd/sync/IpcSyncContextTest.java         |  2 +-
 6 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/sync/MvndSyncContextFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/sync/MvndSyncContextFactory.java
index 2e22c099..4d7f4c84 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/sync/MvndSyncContextFactory.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/sync/MvndSyncContextFactory.java
@@ -30,8 +30,8 @@ import javax.inject.Singleton;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.SyncContext;
 import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.impl.SyncContextFactory;
 import org.eclipse.aether.metadata.Metadata;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
 import org.eclipse.sisu.Priority;
 import org.mvndaemon.mvnd.common.Environment;
 
diff --git a/dist/src/main/provisio/maven-distro.xml b/dist/src/main/provisio/maven-distro.xml
index 3ddf54dc..31c1e68f 100644
--- a/dist/src/main/provisio/maven-distro.xml
+++ b/dist/src/main/provisio/maven-distro.xml
@@ -20,10 +20,21 @@
     <artifactSet to="/mvn">
         <artifact id="org.apache.maven:apache-maven:tar.gz:bin">
             <unpack useRoot="false"
-                    excludes="lib/*slf4j*,conf/logging/*,lib/maven-slf4j-provider*,bin/mvn*,lib/jansi-*.jar,lib/jansi-native/*"/>
+                    excludes="lib/*slf4j*,conf/logging/*,lib/maven-slf4j-provider*,bin/mvn*,lib/jansi-*.jar,lib/jansi-native/*,lib/maven-resolver-api-*,lib/maven-resolver-impl-*,lib/maven-resolver-spi-*,lib/maven-resolver-util-*,lib/maven-resolver-connector-*,lib/maven-resolver-transport-*"/>
         </artifact>
     </artifactSet>
 
+    <artifactSet to="/mvn/lib">
+        <exclusion id="org.slf4j:slf4j-api"/>
+        <exclusion id="javax.annotation:javax.annotation-api"/>
+        <artifact id="org.apache.maven.resolver:maven-resolver-api"/>
+        <artifact id="org.apache.maven.resolver:maven-resolver-impl"/>
+        <artifact id="org.apache.maven.resolver:maven-resolver-spi"/>
+        <artifact id="org.apache.maven.resolver:maven-resolver-util"/>
+        <artifact id="org.apache.maven.resolver:maven-resolver-connector-basic"/>
+        <artifact id="org.apache.maven.resolver:maven-resolver-transport-wagon"/>
+    </artifactSet>
+
     <artifactSet to="/mvn/lib/ext">
         <artifact id="org.mvndaemon.mvnd:mvnd-daemon:${project.version}">
             <exclusion id="org.codehaus.plexus:plexus-classworlds"/>
diff --git a/pom.xml b/pom.xml
index 635b00a9..bb48bc4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
         <junit.jupiter.version>5.7.2</junit.jupiter.version>
         <logback.version>1.2.3</logback.version>
         <maven.version>3.8.3</maven.version>
-        <maven.resolver.version>1.6.3</maven.resolver.version>
+        <maven.resolver.version>1.7.2</maven.resolver.version>
         <slf4j.version>1.7.32</slf4j.version>
 
         <!-- plugin versions a..z -->
@@ -164,6 +164,37 @@
                 <version>${maven.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.maven.resolver</groupId>
+                <artifactId>maven-resolver-api</artifactId>
+                <version>${maven.resolver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.resolver</groupId>
+                <artifactId>maven-resolver-impl</artifactId>
+                <version>${maven.resolver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.resolver</groupId>
+                <artifactId>maven-resolver-spi</artifactId>
+                <version>${maven.resolver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.resolver</groupId>
+                <artifactId>maven-resolver-util</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-wagon</artifactId>
+                <version>${maven.resolver.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
diff --git a/sync/pom.xml b/sync/pom.xml
index 2cc0151c..c25ff3df 100644
--- a/sync/pom.xml
+++ b/sync/pom.xml
@@ -34,12 +34,10 @@
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-api</artifactId>
-            <version>${maven.resolver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-impl</artifactId>
-            <version>${maven.resolver.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
diff --git a/sync/src/main/java/org/mvndaemon/mvnd/sync/IpcSyncContextFactory.java b/sync/src/main/java/org/mvndaemon/mvnd/sync/IpcSyncContextFactory.java
index 651d8bfe..f78e6689 100644
--- a/sync/src/main/java/org/mvndaemon/mvnd/sync/IpcSyncContextFactory.java
+++ b/sync/src/main/java/org/mvndaemon/mvnd/sync/IpcSyncContextFactory.java
@@ -25,7 +25,7 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.SyncContext;
-import org.eclipse.aether.impl.SyncContextFactory;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
 import org.eclipse.sisu.Priority;
 import org.mvndaemon.mvnd.common.BuildProperties;
 import org.mvndaemon.mvnd.common.Environment;
diff --git a/sync/src/test/java/org/mvndaemon/mvnd/sync/IpcSyncContextTest.java b/sync/src/test/java/org/mvndaemon/mvnd/sync/IpcSyncContextTest.java
index f64fb30c..cb0992cb 100644
--- a/sync/src/test/java/org/mvndaemon/mvnd/sync/IpcSyncContextTest.java
+++ b/sync/src/test/java/org/mvndaemon/mvnd/sync/IpcSyncContextTest.java
@@ -23,10 +23,10 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.SyncContext;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.impl.SyncContextFactory;
 import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.LocalRepositoryManager;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;