[MNG-7672] Fork should only execute the project and its submodules (#969

)
apache · Jan 30, 2023 · 48cac1c · 48cac1c
1 parent 8fa5545
commit 48cac1c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...n-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/...n-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.apache.maven.RepositoryUtils;
@@ -86,12 +88,18 @@ public LifecycleDependencyResolver(ProjectDependenciesResolver projectDependenci
 
     public static List<MavenProject> getProjects(MavenProject project, MavenSession session, boolean aggregator) {
         if (aggregator) {
-            return session.getProjects();
+            return getProjectAndSubModules(project).collect(Collectors.toList());
         } else {
             return Collections.singletonList(project);
         }
     }
 
+    private static Stream<MavenProject> getProjectAndSubModules(MavenProject project) {
+        return Stream.concat(
+                Stream.of(project),
+                project.getCollectedProjects().stream().flatMap(LifecycleDependencyResolver::getProjectAndSubModules));
+    }
+
     public void resolveProjectDependencies(
             MavenProject project,
             Collection<String> scopesToCollect,