[EXPERIMENT] Delegate to Resolver for Artifact ordering

maven-core/src/main/java/org/apache/maven/RepositoryUtils.java

@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +34,7 @@
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.project.DependencyResolutionResult;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.ArtifactProperties;
@@ -106,6 +108,7 @@ public static org.apache.maven.artifact.Artifact toArtifact(Artifact artifact) {
         return result;
     }
 
+    @Deprecated
     public static void toArtifacts(
             Collection<org.apache.maven.artifact.Artifact> artifacts,
             Collection<? extends DependencyNode> nodes,
@@ -127,6 +130,39 @@ public static void toArtifacts(
         }
     }
 
+    public static void toArtifactChildrenOnly(
+            Collection<org.apache.maven.artifact.Artifact> artifacts,
+            DependencyResolutionResult result,
+            List<String> trail) {
+        HashMap<String, org.apache.maven.artifact.Artifact> map = new HashMap<>();
+        convertWithTrail(map, result.getDependencyGraph().getChildren(), trail);
+
+        for (Dependency dependency : result.getResolvedDependencies()) {
+            org.apache.maven.artifact.Artifact artifact = map.get(dependency.toString());
+            if (artifact != null) {
+                artifacts.add(artifact);
+            }
+        }
+    }
+
+    private static void convertWithTrail(
+            Map<String, org.apache.maven.artifact.Artifact> map,
+            Collection<? extends DependencyNode> nodes,
+            List<String> trail) {
+        for (DependencyNode node : nodes) {
+            org.apache.maven.artifact.Artifact artifact = toArtifact(node.getDependency());
+
+            List<String> nodeTrail = new ArrayList<>(trail.size() + 1);
+            nodeTrail.addAll(trail);
+            nodeTrail.add(artifact.getId());
+
+            artifact.setDependencyTrail(nodeTrail);
+            map.put(node.getDependency().toString(), artifact);
+
+            convertWithTrail(map, node.getChildren(), nodeTrail);
+        }
+    }
+
     public static Artifact toArtifact(org.apache.maven.artifact.Artifact artifact) {
         if (artifact == null) {
             return null;

maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java

@@ -249,11 +249,11 @@ private Set<Artifact> getDependencies(
         Set<Artifact> artifacts = new LinkedHashSet<>();
         if (result.getDependencyGraph() != null
                 && !result.getDependencyGraph().getChildren().isEmpty()) {
-            RepositoryUtils.toArtifacts(
+
+            RepositoryUtils.toArtifactChildrenOnly(
                     artifacts,
-                    result.getDependencyGraph().getChildren(),
-                    Collections.singletonList(project.getArtifact().getId()),
-                    collectionFilter);
+                    result,
+                    Collections.singletonList(project.getArtifact().getId()));
         }
         return artifacts;
     }

maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java

@@ -30,7 +30,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -103,10 +102,10 @@
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.resolution.DependencyResult;
 import org.eclipse.aether.util.filter.AndDependencyFilter;
-import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
 
 /**
  * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such
@@ -374,17 +373,14 @@ private void createPluginRealm(
         DependencyFilter dependencyFilter = project.getExtensionDependencyFilter();
         dependencyFilter = AndDependencyFilter.newInstance(dependencyFilter, filter);
 
-        DependencyNode root = pluginDependenciesResolver.resolve(
+        DependencyResult root = pluginDependenciesResolver.resolve(
                 plugin,
                 RepositoryUtils.toArtifact(pluginArtifact),
                 dependencyFilter,
                 project.getRemotePluginRepositories(),
                 repositorySession);
 
-        PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
-        root.accept(nlg);
-
-        pluginArtifacts = toMavenArtifacts(root, nlg);
+        pluginArtifacts = toMavenArtifacts(root);
 
         pluginRealm = classRealmManager.createPluginRealm(
                 plugin, parent, null, foreignImports, toAetherArtifacts(pluginArtifacts));
@@ -422,15 +418,12 @@ private List<org.eclipse.aether.artifact.Artifact> toAetherArtifacts(final List<
         return new ArrayList<>(RepositoryUtils.toArtifacts(pluginArtifacts));
     }
 
-    private List<Artifact> toMavenArtifacts(DependencyNode root, PreorderNodeListGenerator nlg) {
-        List<Artifact> artifacts = new ArrayList<>(nlg.getNodes().size());
-        RepositoryUtils.toArtifacts(artifacts, Collections.singleton(root), Collections.<String>emptyList(), null);
-        for (Iterator<Artifact> it = artifacts.iterator(); it.hasNext(); ) {
-            Artifact artifact = it.next();
-            if (artifact.getFile() == null) {
-                it.remove();
-            }
-        }
+    private List<Artifact> toMavenArtifacts(DependencyResult dependencyResult) {
+        List<Artifact> artifacts =
+                new ArrayList<>(dependencyResult.getArtifactResults().size());
+        dependencyResult.getArtifactResults().stream()
+                .filter(ArtifactResult::isResolved)
+                .forEach(a -> artifacts.add(RepositoryUtils.toArtifact(a.getArtifact())));
         return Collections.unmodifiableList(artifacts);
     }
 
@@ -826,9 +819,7 @@ public ExtensionRealmCache.CacheRecord setupExtensionsRealm(
     private List<Artifact> resolveExtensionArtifacts(
             Plugin extensionPlugin, List<RemoteRepository> repositories, RepositorySystemSession session)
             throws PluginResolutionException {
-        DependencyNode root = pluginDependenciesResolver.resolve(extensionPlugin, null, null, repositories, session);
-        PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
-        root.accept(nlg);
-        return toMavenArtifacts(root, nlg);
+        DependencyResult root = pluginDependenciesResolver.resolve(extensionPlugin, null, null, repositories, session);
+        return toMavenArtifacts(root);
     }
 }

maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java

@@ -52,6 +52,7 @@
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
+import org.eclipse.aether.resolution.DependencyResult;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.filter.AndDependencyFilter;
 import org.eclipse.aether.util.filter.ScopeDependencyFilter;
@@ -146,7 +147,7 @@ public Artifact resolve(Plugin plugin, List<RemoteRepository> repositories, Repo
     /**
      * @since 3.3.0
      */
-    public DependencyNode resolveCoreExtension(
+    public DependencyResult resolveCoreExtension(
             Plugin plugin,
             DependencyFilter dependencyFilter,
             List<RemoteRepository> repositories,
@@ -155,7 +156,7 @@ public DependencyNode resolveCoreExtension(
         return resolveInternal(plugin, null /* pluginArtifact */, dependencyFilter, repositories, session);
     }
 
-    public DependencyNode resolve(
+    public DependencyResult resolve(
             Plugin plugin,
             Artifact pluginArtifact,
             DependencyFilter dependencyFilter,
@@ -165,7 +166,7 @@ public DependencyNode resolve(
         return resolveInternal(plugin, pluginArtifact, dependencyFilter, repositories, session);
     }
 
-    private DependencyNode resolveInternal(
+    private DependencyResult resolveInternal(
             Plugin plugin,
             Artifact pluginArtifact,
             DependencyFilter dependencyFilter,
@@ -216,14 +217,12 @@ private DependencyNode resolveInternal(
             }
 
             depRequest.setRoot(node);
-            repoSystem.resolveDependencies(session, depRequest);
+            return repoSystem.resolveDependencies(session, depRequest);
         } catch (DependencyCollectionException e) {
             throw new PluginResolutionException(plugin, e);
         } catch (DependencyResolutionException e) {
             throw new PluginResolutionException(plugin, e.getCause());
         }
-
-        return node;
     }
 
     // Keep this class in sync with org.apache.maven.project.DefaultProjectDependenciesResolver.GraphLogger

maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java

@@ -25,8 +25,8 @@
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.DependencyResult;
 
 /**
  * Assists in resolving the dependencies of a plugin. <strong>Warning:</strong> This is an internal utility interface
@@ -62,7 +62,7 @@ Artifact resolve(Plugin plugin, List<RemoteRepository> repositories, RepositoryS
      * @return The dependency tree denoting the resolved plugin class path, never {@code null}.
      * @throws PluginResolutionException If any dependency could not be resolved.
      */
-    DependencyNode resolve(
+    DependencyResult resolve(
             Plugin plugin,
             Artifact pluginArtifact,
             DependencyFilter dependencyFilter,

maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

@@ -228,11 +228,10 @@ private DependencyResolutionResult resolveDependencies(MavenProject project, Rep
 
         Set<Artifact> artifacts = new LinkedHashSet<>();
         if (resolutionResult.getDependencyGraph() != null) {
-            RepositoryUtils.toArtifacts(
+            RepositoryUtils.toArtifactChildrenOnly(
                     artifacts,
-                    resolutionResult.getDependencyGraph().getChildren(),
-                    Collections.singletonList(project.getArtifact().getId()),
-                    null);
+                    resolutionResult,
+                    Collections.singletonList(project.getArtifact().getId()));
 
             // Maven 2.x quirk: an artifact always points at the local repo, regardless whether resolved or not
             LocalRepositoryManager lrm = session.getLocalRepositoryManager();

maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java

@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.cli.internal.extension.model.CoreExtension;
@@ -48,10 +49,10 @@
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.resolution.DependencyResult;
 import org.eclipse.aether.util.filter.ExclusionsDependencyFilter;
-import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
 
 /**
  * BootstrapCoreExtensionManager
@@ -171,13 +172,12 @@ private List<Artifact> resolveExtension(
             plugin.setArtifactId(interpolator.interpolate(extension.getArtifactId()));
             plugin.setVersion(interpolator.interpolate(extension.getVersion()));
 
-            DependencyNode root = pluginDependenciesResolver.resolveCoreExtension(
+            DependencyResult root = pluginDependenciesResolver.resolveCoreExtension(
                     plugin, dependencyFilter, repositories, repoSession);
-            PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
-            root.accept(nlg);
-            List<Artifact> artifacts = nlg.getArtifacts(false);
-
-            return artifacts;
+            return root.getArtifactResults().stream()
+                    .filter(ArtifactResult::isResolved)
+                    .map(ArtifactResult::getArtifact)
+                    .collect(Collectors.toList());
         } catch (PluginResolutionException e) {
             throw new ExtensionResolutionException(extension, e.getCause());
         } catch (InterpolationException e) {

pom.xml

@@ -147,7 +147,7 @@ under the License.
     <securityDispatcherVersion>2.0</securityDispatcherVersion>
     <cipherVersion>2.0</cipherVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <resolverVersion>1.9.14</resolverVersion>
+    <resolverVersion>1.9.15-SNAPSHOT</resolverVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <xmlunitVersion>2.9.1</xmlunitVersion>
     <powermockVersion>2.0.9</powermockVersion>