[MNG-6529] Honor request.isResolvedDependency

apache · Nov 27, 2018 · bb58484 · bb58484
1 parent e0c2745
commit bb58484
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -371,7 +371,7 @@ public List<ProjectBuildingResult> build( List<File> pomFiles, boolean recursive
         {
             noErrors =
                 build( results, new ArrayList<MavenProject>(), projectIndex, interimResults, request,
-                       new HashMap<File, Boolean>() ) && noErrors;
+                       new HashMap<File, Boolean>(), config.session ) && noErrors;
         }
         finally
         {
@@ -572,7 +572,8 @@ private void populateReactorModelPool( ReactorModelPool reactorModelPool, List<I
 
     private boolean build( List<ProjectBuildingResult> results, List<MavenProject> projects,
                            Map<String, MavenProject> projectIndex, List<InterimResult> interimResults,
-                           ProjectBuildingRequest request, Map<File, Boolean> profilesXmls )
+                           ProjectBuildingRequest request, Map<File, Boolean> profilesXmls,
+                           RepositorySystemSession session )
     {
         boolean noErrors = true;
 
@@ -587,15 +588,21 @@ private boolean build( List<ProjectBuildingResult> results, List<MavenProject> p
 
                 List<MavenProject> modules = new ArrayList<>();
                 noErrors =
-                    build( results, modules, projectIndex, interimResult.modules, request, profilesXmls ) && noErrors;
+                    build( results, modules, projectIndex, interimResult.modules, request, profilesXmls, session )
+                    && noErrors;
 
                 projects.addAll( modules );
                 projects.add( project );
 
                 project.setExecutionRoot( interimResult.root );
                 project.setCollectedProjects( modules );
+                DependencyResolutionResult resolutionResult = null;
+                if ( request.isResolveDependencies() )
+                {
+                    resolutionResult = resolveDependencies( project, session );
+                }
 
-                results.add( new DefaultProjectBuildingResult( project, result.getProblems(), null ) );
+                results.add( new DefaultProjectBuildingResult( project, result.getProblems(), resolutionResult ) );
             }
             catch ( ModelBuildingException e )
             {