From 144bc73d5c03199b6c5f24da6d232f26409cd11d Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 29 Apr 2024 17:59:02 +0200
Subject: [PATCH 1/2] Resolver updates

---
 .../apache/maven/internal/impl/AbstractSession.java   | 11 ++++-------
 .../maven/internal/impl/DefaultArtifactResolver.java  |  2 +-
 .../maven/internal/impl/DefaultLocalRepository.java   |  2 +-
 .../internal/impl/DefaultLocalRepositoryManager.java  |  2 +-
 .../maven/internal/impl/DefaultRepositoryFactory.java |  2 +-
 .../apache/maven/internal/impl/DefaultTransport.java  |  4 ++--
 .../maven/internal/impl/resolver/MavenMetadata.java   |  1 +
 .../impl/resolver/MavenSessionBuilderSupplier.java    |  4 ++--
 .../internal/impl/resolver/RelocatedArtifact.java     | 11 -----------
 .../src/main/java/org/apache/maven/ReactorReader.java |  2 +-
 .../maven/internal/impl/DefaultArtifactManager.java   |  6 +-----
 .../maven/repository/TestRepositoryConnector.java     |  4 ++--
 .../maven/model/building/DefaultModelBuilder.java     |  2 +-
 .../maven/repository/internal/RelocatedArtifact.java  | 11 -----------
 14 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
index 3b9149289a4..464941d23cf 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
@@ -214,7 +214,7 @@ public LocalRepository getLocalRepository() {
     public Session withLocalRepository(@Nonnull LocalRepository localRepository) {
         nonNull(localRepository, "localRepository");
         if (session.getLocalRepository() != null
-                && Objects.equals(session.getLocalRepository().getBasedir().toPath(), localRepository.getPath())) {
+                && Objects.equals(session.getLocalRepository().getBasePath(), localRepository.getPath())) {
             return this;
         }
         org.eclipse.aether.repository.LocalRepository repository = toRepository(localRepository);
@@ -293,13 +293,10 @@ public List<org.eclipse.aether.artifact.Artifact> toArtifacts(Collection<Artifac
 
     @Override
     public org.eclipse.aether.artifact.Artifact toArtifact(Artifact artifact) {
-        File file = getService(ArtifactManager.class)
-                .getPath(artifact)
-                .map(Path::toFile)
-                .orElse(null);
+        Path path = getService(ArtifactManager.class).getPath(artifact).orElse(null);
         if (artifact instanceof DefaultArtifact) {
             org.eclipse.aether.artifact.Artifact a = ((DefaultArtifact) artifact).getArtifact();
-            if (Objects.equals(file, a.getFile())) {
+            if (Objects.equals(path, a.getPath())) {
                 return a;
             }
         }
@@ -310,7 +307,7 @@ public org.eclipse.aether.artifact.Artifact toArtifact(Artifact artifact) {
                 artifact.getExtension(),
                 artifact.getVersion().toString(),
                 null,
-                file);
+                path);
     }
 
     @Override
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
index 72ae752e328..66bd4939c4e 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
@@ -69,7 +69,7 @@ public ArtifactResolverResult resolve(ArtifactResolverRequest request)
                         session.getRepositorySystem().resolveArtifacts(session.getSession(), requests);
                 for (ArtifactResult result : results) {
                     Artifact artifact = session.getArtifact(result.getArtifact());
-                    Path path = result.getArtifact().getFile().toPath();
+                    Path path = result.getArtifact().getPath();
                     artifactManager.setPath(artifact, path);
                     paths.put(artifact, path);
                 }
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
index 4c6797599ec..3ca2d59f790 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
@@ -53,6 +53,6 @@ public String getType() {
     @Nonnull
     @Override
     public Path getPath() {
-        return repository.getBasedir().toPath();
+        return repository.getBasePath();
     }
 }
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java
index da5558fe5e9..32c98135cf7 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java
@@ -52,7 +52,7 @@ private org.eclipse.aether.repository.LocalRepositoryManager getManager(
             InternalSession session, LocalRepository local) {
         org.eclipse.aether.repository.LocalRepository repository = session.toRepository(local);
         if ("enhanced".equals(repository.getContentType())) {
-            repository = new org.eclipse.aether.repository.LocalRepository(repository.getBasedir(), "");
+            repository = new org.eclipse.aether.repository.LocalRepository(repository.getBasePath(), "");
         }
         return session.getRepositorySystem().newLocalRepositoryManager(session.getSession(), repository);
     }
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java
index 2a85389e4e0..06774cdccc9 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java
@@ -34,7 +34,7 @@ public class DefaultRepositoryFactory implements RepositoryFactory {
 
     @Override
     public LocalRepository createLocal(Path path) {
-        return new DefaultLocalRepository(new org.eclipse.aether.repository.LocalRepository(path.toFile()));
+        return new DefaultLocalRepository(new org.eclipse.aether.repository.LocalRepository(path));
     }
 
     @Override
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
index 9c609a26fc1..5eabf7f64aa 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
@@ -54,7 +54,7 @@ public boolean get(URI relativeSource, Path target) {
             throw new IllegalArgumentException("Supplied relative URI escapes baseUrl");
         }
         GetTask getTask = new GetTask(source);
-        getTask.setDataFile(target.toFile());
+        getTask.setDataPath(target);
         try {
             transporter.get(getTask);
             return true;
@@ -110,7 +110,7 @@ public void put(Path source, URI relativeTarget) {
         }
 
         PutTask putTask = new PutTask(target);
-        putTask.setDataFile(source.toFile());
+        putTask.setDataPath(source);
         try {
             transporter.put(putTask);
         } catch (Exception e) {
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java
index 80946c622d4..0d8e6531192 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java
@@ -89,6 +89,7 @@ public Path getPath() {
         return path;
     }
 
+    @Deprecated
     public void merge(File existing, File result) throws RepositoryException {
         merge(existing != null ? existing.toPath() : null, result != null ? result.toPath() : null);
     }
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
index dbb5d22786d..8b79d2bbae3 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
@@ -46,8 +46,8 @@
 import org.eclipse.aether.util.graph.selector.AndDependencySelector;
 import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
 import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
+import org.eclipse.aether.util.graph.transformer.ConfigurableVersionSelector;
 import org.eclipse.aether.util.graph.transformer.ConflictResolver;
-import org.eclipse.aether.util.graph.transformer.NearestVersionSelector;
 import org.eclipse.aether.util.graph.transformer.SimpleOptionalitySelector;
 import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
 
@@ -98,7 +98,7 @@ protected DependencySelector getDependencySelector() {
     protected DependencyGraphTransformer getDependencyGraphTransformer() {
         return new ChainedDependencyGraphTransformer(
                 new ConflictResolver(
-                        new NearestVersionSelector(), new ManagedScopeSelector(getScopeManager()),
+                        new ConfigurableVersionSelector(), new ManagedScopeSelector(getScopeManager()),
                         new SimpleOptionalitySelector(), new ManagedScopeDeriver(getScopeManager())),
                 new ManagedDependencyContextRefiner(getScopeManager()));
     }
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
index 25174a141f4..266f79cc3c7 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
@@ -116,17 +116,6 @@ public Artifact setVersion(String version) {
         return new RelocatedArtifact(artifact, groupId, artifactId, classifier, extension, version, message);
     }
 
-    @Deprecated
-    @Override
-    public Artifact setFile(File file) {
-        File current = getFile();
-        if (Objects.equals(current, file)) {
-            return this;
-        }
-        return new RelocatedArtifact(
-                artifact.setFile(file), groupId, artifactId, classifier, extension, version, message);
-    }
-
     @Override
     public Artifact setPath(Path path) {
         Path current = getPath();
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index 25d3ba0b9e9..2c7995bdcfd 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -409,7 +409,7 @@ private void installIntoProjectLocalRepository(Artifact artifact) {
             LOGGER.info("Copying {} to project local repository", artifact);
             Files.createDirectories(target.getParent());
             Files.copy(
-                    artifact.getFile().toPath(),
+                    artifact.getPath(),
                     target,
                     StandardCopyOption.REPLACE_EXISTING,
                     StandardCopyOption.COPY_ATTRIBUTES);
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
index 3835e812509..be0ae1d5ba1 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -21,7 +21,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Objects;
@@ -67,10 +66,7 @@ public Optional<Path> getPath(@Nonnull Artifact artifact) {
         }
         Path path = paths.get(id);
         if (path == null && artifact instanceof DefaultArtifact) {
-            File file = ((DefaultArtifact) artifact).getArtifact().getFile();
-            if (file != null) {
-                path = file.toPath();
-            }
+            path = ((DefaultArtifact) artifact).getArtifact().getPath();
         }
         return Optional.ofNullable(path);
     }
diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
index 1cc4eff2d76..e9ab683c317 100644
--- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
+++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
@@ -75,7 +75,7 @@ public void get(
             for (ArtifactDownload download : artifactDownloads) {
                 File remoteFile = new File(basedir, path(download.getArtifact()));
                 try {
-                    Path dest = download.getFile().toPath();
+                    Path dest = download.getPath();
                     Files.createDirectories(dest.getParent());
                     Files.copy(remoteFile.toPath(), dest);
                 } catch (IOException e) {
@@ -91,7 +91,7 @@ public void get(
             for (final MetadataDownload download : metadataDownloads) {
                 File remoteFile = new File(basedir, path(download.getMetadata()));
                 try {
-                    Path dest = download.getFile().toPath();
+                    Path dest = download.getPath();
                     Files.createDirectories(dest.getParent());
                     Files.copy(remoteFile.toPath(), dest);
                 } catch (IOException e) {
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index bc84b81c214..aa28e758b7e 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1190,7 +1190,7 @@ private org.apache.maven.api.model.Model doReadFileModel(
         }
 
         if (modelSource instanceof FileModelSource) {
-            model = model.withPomFile(((FileModelSource) modelSource).getFile().toPath());
+            model = model.withPomFile(((FileModelSource) modelSource).getPath());
         }
 
         Model retModel = new Model(model);
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
index e0f8b8b92c4..02b60612c82 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -116,17 +116,6 @@ public Artifact setVersion(String version) {
         return new RelocatedArtifact(artifact, groupId, artifactId, classifier, extension, version, message);
     }
 
-    @Deprecated
-    @Override
-    public Artifact setFile(File file) {
-        File current = getFile();
-        if (Objects.equals(current, file)) {
-            return this;
-        }
-        return new RelocatedArtifact(
-                artifact.setFile(file), groupId, artifactId, classifier, extension, version, message);
-    }
-
     @Override
     public Artifact setPath(Path path) {
         Path current = getPath();

From 8fcf467f48889e4b89c3ccdc2557ad08594bb0f4 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 2 May 2024 17:16:19 +0200
Subject: [PATCH 2/2] Partial revert "Resolver updates"

This reverts commit 144bc73d5c03199b6c5f24da6d232f26409cd11d.
---
 .../internal/impl/resolver/RelocatedArtifact.java     | 11 +++++++++++
 .../maven/repository/internal/RelocatedArtifact.java  | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
index 266f79cc3c7..25174a141f4 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
@@ -116,6 +116,17 @@ public Artifact setVersion(String version) {
         return new RelocatedArtifact(artifact, groupId, artifactId, classifier, extension, version, message);
     }
 
+    @Deprecated
+    @Override
+    public Artifact setFile(File file) {
+        File current = getFile();
+        if (Objects.equals(current, file)) {
+            return this;
+        }
+        return new RelocatedArtifact(
+                artifact.setFile(file), groupId, artifactId, classifier, extension, version, message);
+    }
+
     @Override
     public Artifact setPath(Path path) {
         Path current = getPath();
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
index 02b60612c82..e0f8b8b92c4 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -116,6 +116,17 @@ public Artifact setVersion(String version) {
         return new RelocatedArtifact(artifact, groupId, artifactId, classifier, extension, version, message);
     }
 
+    @Deprecated
+    @Override
+    public Artifact setFile(File file) {
+        File current = getFile();
+        if (Objects.equals(current, file)) {
+            return this;
+        }
+        return new RelocatedArtifact(
+                artifact.setFile(file), groupId, artifactId, classifier, extension, version, message);
+    }
+
     @Override
     public Artifact setPath(Path path) {
         Path current = getPath();