[MNG-7720] Wrong build order of forked projects (#1038)

cstamas · web-flow · commit 57acdd41b46d · 2023-03-08T09:03:33.000+01:00
The original fix MNG-7672 matched the "scope" but missed the "order". `project.collectedProjects` are in order as loaded (POM order), is not topologically sorted. Fix is to use DAG of projects, ask for downstream projects (will return more then we need but sorted) and narrow that list to only contain collected projects. Related commit: 48cac1c --- https://issues.apache.org/jira/browse/MNG-7720
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -90,7 +90,11 @@ public LifecycleDependencyResolver(ProjectDependenciesResolver projectDependenci
 
     public static List<MavenProject> getProjects(MavenProject project, MavenSession session, boolean aggregator) {
         if (aggregator && project.getCollectedProjects() != null) {
-            return getProjectAndSubModules(project).collect(Collectors.toList());
+            List<MavenProject> projectAndSubmodules =
+                    getProjectAndSubModules(project).collect(Collectors.toList()); // not sorted but what we need
+            return session.getProjects().stream() // sorted all
+                    .filter(projectAndSubmodules::contains)
+                    .collect(Collectors.toList()); // sorted and filtered to what we need
         } else {
             return Collections.singletonList(project);
         }
@@ -99,7 +103,10 @@ public static List<MavenProject> getProjects(MavenProject project, MavenSession
     private static Stream<MavenProject> getProjectAndSubModules(MavenProject project) {
         return Stream.concat(
                 Stream.of(project),
-                project.getCollectedProjects().stream().flatMap(LifecycleDependencyResolver::getProjectAndSubModules));
+                project.getCollectedProjects() == null
+                        ? Stream.empty()
+                        : project.getCollectedProjects().stream()
+                                .flatMap(LifecycleDependencyResolver::getProjectAndSubModules));
     }
 
     public void resolveProjectDependencies(
