Skip to content

Commit 48cac1c

Browse files
authored
[MNG-7672] Fork should only execute the project and its submodules (#969)
1 parent 8fa5545 commit 48cac1c

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import java.util.List;
2828
import java.util.Map;
2929
import java.util.Set;
30+
import java.util.stream.Collectors;
31+
import java.util.stream.Stream;
3032
import javax.inject.Inject;
3133
import javax.inject.Named;
3234
import org.apache.maven.RepositoryUtils;
@@ -86,12 +88,18 @@ public LifecycleDependencyResolver(ProjectDependenciesResolver projectDependenci
8688

8789
public static List<MavenProject> getProjects(MavenProject project, MavenSession session, boolean aggregator) {
8890
if (aggregator) {
89-
return session.getProjects();
91+
return getProjectAndSubModules(project).collect(Collectors.toList());
9092
} else {
9193
return Collections.singletonList(project);
9294
}
9395
}
9496

97+
private static Stream<MavenProject> getProjectAndSubModules(MavenProject project) {
98+
return Stream.concat(
99+
Stream.of(project),
100+
project.getCollectedProjects().stream().flatMap(LifecycleDependencyResolver::getProjectAndSubModules));
101+
}
102+
95103
public void resolveProjectDependencies(
96104
MavenProject project,
97105
Collection<String> scopesToCollect,

0 commit comments

Comments
 (0)