From ae933fe68d1b2dc8cbe1e22b14781024e0540d26 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 23 Mar 2023 06:31:49 +0100
Subject: [PATCH] [MNG-7720] Simplify code (#1063)

---
 .../internal/LifecycleDependencyResolver.java     | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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
index 62cd8c8cea..f7a4d484fb 100644
--- 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
@@ -31,7 +31,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
@@ -90,8 +89,9 @@ public LifecycleDependencyResolver(
 
     public static List<MavenProject> getProjects(MavenProject project, MavenSession session, boolean aggregator) {
         if (aggregator && project.getCollectedProjects() != null) {
-            List<MavenProject> projectAndSubmodules =
-                    getProjectAndSubModules(project).collect(Collectors.toList()); // not sorted but what we need
+            // get the unsorted list of wanted projects
+            Set<MavenProject> projectAndSubmodules = new HashSet<>(project.getCollectedProjects());
+            projectAndSubmodules.add(project);
             return session.getProjects().stream() // sorted all
                     .filter(projectAndSubmodules::contains)
                     .collect(Collectors.toList()); // sorted and filtered to what we need
@@ -100,15 +100,6 @@ public static List<MavenProject> getProjects(MavenProject project, MavenSession
         }
     }
 
-    private static Stream<MavenProject> getProjectAndSubModules(MavenProject project) {
-        return Stream.concat(
-                Stream.of(project),
-                project.getCollectedProjects() == null
-                        ? Stream.empty()
-                        : project.getCollectedProjects().stream()
-                                .flatMap(LifecycleDependencyResolver::getProjectAndSubModules));
-    }
-
     public void resolveProjectDependencies(
             MavenProject project,
             Collection<String> scopesToCollect,