From bb584842900eda2d5317bfce6a4f27c52756164c Mon Sep 17 00:00:00 2001 From: Mickael Istria Date: Tue, 27 Nov 2018 23:33:18 +0100 Subject: [PATCH] [MNG-6529] Honor request.isResolvedDependency --- .../maven/project/DefaultProjectBuilder.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 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 index a6590463a02..35a4e9f5968 100644 --- 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 build( List pomFiles, boolean recursive { noErrors = build( results, new ArrayList(), projectIndex, interimResults, request, - new HashMap() ) && noErrors; + new HashMap(), config.session ) && noErrors; } finally { @@ -572,7 +572,8 @@ private void populateReactorModelPool( ReactorModelPool reactorModelPool, List results, List projects, Map projectIndex, List interimResults, - ProjectBuildingRequest request, Map profilesXmls ) + ProjectBuildingRequest request, Map profilesXmls, + RepositorySystemSession session ) { boolean noErrors = true; @@ -587,15 +588,21 @@ private boolean build( List results, List p List 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 ) {