Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7720] Simplify code (#1063)

This commit is contained in:
Guillaume Nodet 2023-03-23 06:31:49 +01:00 committed by GitHub
parent 2788849c37
commit ae933fe68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,