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/12 17:24:23 UTC
[maven] branch master updated: [MNG-7110] Different behavior of
extensions restore configuration of importRequest
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new aa90370 [MNG-7110] Different behavior of extensions restore configuration of importRequest
aa90370 is described below
commit aa90370ff448c68e49ba54bac172f5f7c783292e
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 12 18:24:13 2021 +0100
[MNG-7110] Different behavior of extensions
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 );
}