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 2020/12/14 17:19:58 UTC
[maven] branch MNG-6957 updated (a1de191 -> 6f7f5be)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git.
from a1de191 Adjustments based on review comments
add be8ced6 [MNG-7034] StackOverflowError thrown if a cycle exists in BOM imports
new 6f7f5be Merge branch 'master' into MNG-6957
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.
Summary of changes:
.../maven/model/building/DefaultModelBuilder.java | 11 +-
.../model/building/DefaultModelBuilderTest.java | 147 +++++++++++++++++++++
2 files changed, 156 insertions(+), 2 deletions(-)
create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
[maven] 01/01: Merge branch 'master' into MNG-6957
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6957
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6f7f5be40df8e476d8bef5117cabc98639eacf63
Merge: a1de191 be8ced6
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Dec 14 18:19:43 2020 +0100
Merge branch 'master' into MNG-6957
.../maven/model/building/DefaultModelBuilder.java | 11 +-
.../model/building/DefaultModelBuilderTest.java | 147 +++++++++++++++++++++
2 files changed, 156 insertions(+), 2 deletions(-)
diff --cc maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 9779f5c,8b31908..f833c25
--- 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
@@@ -277,33 -272,6 +284,33 @@@ public class DefaultModelBuilde
DefaultModelProblemCollector problems = new DefaultModelProblemCollector( result );
+ // read and validate raw model
+ Model fileModel = readFileModel( request, problems );
+
+ request.setFileModel( fileModel );
+ result.setFileModel( fileModel );
+
+ activateFileModel( request, result, problems );
+
+ if ( !request.isTwoPhaseBuilding() )
+ {
- return build( request, result );
++ return build( request, result, importIds );
+ }
+ else if ( hasModelErrors( problems ) )
+ {
+ throw problems.newModelBuildingException();
+ }
+
+ return result;
+ }
+
+ private void activateFileModel( final ModelBuildingRequest request, final DefaultModelBuildingResult result,
+ DefaultModelProblemCollector problems )
+ throws ModelBuildingException
+ {
+ Model inputModel = request.getFileModel();
+ problems.setRootModel( inputModel );
+
// profile activation
DefaultProfileActivationContext profileActivationContext = getProfileActivationContext( request );