You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/12/09 16:44:18 UTC
[maven] 02/02: [MNG-6529] Honor request.isResolveDependencies()
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6529
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a9ced4144b1b010748296ddd978a090f692c0148
Author: Mickael Istria <mi...@redhat.com>
AuthorDate: Tue Nov 27 23:33:18 2018 +0100
[MNG-6529] Honor request.isResolveDependencies()
---
.../org/apache/maven/project/DefaultProjectBuilder.java | 17 +++++++++++++----
1 file changed, 13 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 a659046..390e83e 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 class DefaultProjectBuilder
{
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 @@ public class DefaultProjectBuilder
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,7 +588,8 @@ public class DefaultProjectBuilder
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 );
@@ -595,7 +597,14 @@ public class DefaultProjectBuilder
project.setExecutionRoot( interimResult.root );
project.setCollectedProjects( modules );
- results.add( new DefaultProjectBuildingResult( project, result.getProblems(), null ) );
+ DependencyResolutionResult resolutionResult = null;
+
+ if ( request.isResolveDependencies() )
+ {
+ resolutionResult = resolveDependencies( project, session );
+ }
+
+ results.add( new DefaultProjectBuildingResult( project, result.getProblems(), resolutionResult ) );
}
catch ( ModelBuildingException e )
{