You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/03/06 14:48:20 UTC
[maven] branch MNG-7110 created (now a2751a3)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-7110
in repository https://gitbox.apache.org/repos/asf/maven.git.
at a2751a3 MNG-7110: restore configuration of importRequest
This branch includes the following new commits:
new a2751a3 MNG-7110: restore configuration of importRequest
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: MNG-7110: restore configuration of importRequest
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-7110
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a2751a3e64860c59ce420539250d15508cef411e
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Mar 6 15:48:11 2021 +0100
MNG-7110: restore configuration of importRequest
---
.../apache/maven/model/building/DefaultModelBuilder.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index afde52a..845480c 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1414,11 +1414,15 @@ public class DefaultModelBuilder
final ModelBuildingResult importResult;
try
{
- ModelBuildingRequest importRequest = new DefaultModelBuildingRequest( request )
- .setTwoPhaseBuilding( false )
- .setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL )
- .setModelSource( importSource )
- .setModelResolver( modelResolver.newCopy() );
+ ModelBuildingRequest importRequest = new DefaultModelBuildingRequest();
+ importRequest.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+ importRequest.setModelCache( request.getModelCache() );
+ importRequest.setSystemProperties( request.getSystemProperties() );
+ importRequest.setUserProperties( request.getUserProperties() );
+ importRequest.setLocationTracking( request.isLocationTracking() );
+
+ importRequest.setModelSource( importSource );
+ importRequest.setModelResolver( modelResolver.newCopy() );
importResult = build( importRequest, importIds );
}