MNG-6173 MavenSession.getAllProjects() should return all projects in the reactor
This commit moves the initialisation of the allProjects field in MavenSession into the DefaultGraphBuilder as the full list of projects in the reactor is only available their. Since MavenSessions's projects and projectDependencyGraph fields were already initialised in DefaultGraphBuilder, the code that sets them again in DefaultMaven is removed. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ee1889a2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ee1889a2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ee1889a2 Branch: refs/heads/MNG-6173 Commit: ee1889a2797d4eee4c5b2c46ff448b39cea4f122 Parents: 862c84a Author: Christoph Böhme <christ...@b3e.net> Authored: Mon Feb 20 07:32:17 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Mon Mar 6 15:10:43 2017 +0100 ---------------------------------------------------------------------- maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 9 --------- .../java/org/apache/maven/graph/DefaultGraphBuilder.java | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/ee1889a2/maven-core/src/main/java/org/apache/maven/DefaultMaven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 15b946e..c519bef 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -520,15 +520,6 @@ public class DefaultMaven logger.error( problem.toString() ); } } - - if ( !graphResult.hasErrors() ) - { - ProjectDependencyGraph projectDependencyGraph = graphResult.get(); - session.setProjects( projectDependencyGraph.getSortedProjects() ); - session.setAllProjects( projectDependencyGraph.getSortedProjects() ); - session.setProjectDependencyGraph( projectDependencyGraph ); - } - return graphResult; } http://git-wip-us.apache.org/repos/asf/maven/blob/ee1889a2/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java index 680d584..dea3d20 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java @@ -81,6 +81,7 @@ public class DefaultGraphBuilder try { projects = getProjectsForMavenReactor( session ); + session.setAllProjects( projects ); } catch ( ProjectBuildingException e ) {
