You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/01/30 14:08:18 UTC
[maven] branch master updated: [MNG-7672] Fork should only execute the project and its submodules (#968)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 30fafa674 [MNG-7672] Fork should only execute the project and its submodules (#968)
30fafa674 is described below
commit 30fafa674172453f7311b1ccc89ce889ff943b28
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 30 15:08:08 2023 +0100
[MNG-7672] Fork should only execute the project and its submodules (#968)
---
.../maven/lifecycle/internal/LifecycleDependencyResolver.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 c5073de83..33272b29d 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
@@ -30,6 +30,8 @@ import java.util.LinkedHashSet;
import java.util.List;
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;
@@ -88,12 +90,18 @@ public class LifecycleDependencyResolver {
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,