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/03/14 12:47:14 UTC
[maven] 01/02: Merge branch 'master' into MNG-6656
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 13812669bcfb230ee14072fc2f1bcc837da3ad19
Merge: e0093d5 5cdb833
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Mar 14 12:08:24 2020 +0100
Merge branch 'master' into MNG-6656
.../resources-project-builder/micromailer/pom.xml | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 27 +++++++++++++---------
pom.xml | 2 +-
3 files changed, 18 insertions(+), 13 deletions(-)
diff --cc maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 9b6c5d8,b72550b..6245c8a
--- 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
@@@ -644,34 -637,17 +648,41 @@@ public class DefaultModelBuilde
.setMessage( "Non-readable POM " + modelSource.getLocation() + ": " + msg ).setException( e ) );
throw problems.newModelBuildingException();
}
- model.setPomFile( pomFile );
-
+ if ( pomFile != null )
+ {
+ model.setPomFile( pomFile );
+ }
+ else if ( modelSource instanceof FileModelSource )
+ {
+ model.setPomFile( ( (FileModelSource) modelSource ).getFile() );
+ }
-
problems.setSource( model );
+
+ modelValidator.validateFileModel( model, request, problems );
+ request.setFileModel( model );
+
+ if ( Features.buildConsumer().isActive() && pomFile != null )
+ {
+ try
+ {
+ Model rawModel =
+ modelProcessor.read( pomFile,
+ Collections.singletonMap( "transformerContext", request.getTransformerContext() ) );
+
+ model.setPomFile( pomFile );
+
+ // model with locationTrackers, required for proper feedback during validations
+ model = request.getFileModel().clone();
+
+ // Apply enriched data
+ modelMerger.merge( model, rawModel, false, null );
+ }
+ catch ( IOException e )
+ {
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V37 ).setException( e ) );
+ }
+ }
+
modelValidator.validateRawModel( model, request, problems );
if ( hasFatalErrors( problems ) )