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 2019/11/25 07:30:49 UTC
[maven] 02/02: [MNG-6656] Move post-processing of file to rawmodel
to proper method
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 61a3761537df98839c28a47b388b7e467ad242e4
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Nov 25 08:30:40 2019 +0100
[MNG-6656] Move post-processing of file to rawmodel to proper method
---
.../maven/model/building/DefaultModelBuilder.java | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 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 0e50073..deb790e 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
@@ -314,20 +314,6 @@ public class DefaultModelBuilder
if ( inputModel == null )
{
inputModel = readModel( request.getModelSource(), request.getPomFile(), request, problems );
-
- if ( Features.buildConsumer().isActive() && request.getPomFile() != null )
- {
- try
- {
- inputModel = modelProcessor.read( transformData( request.getPomFile().toPath() ), null );
-
- inputModel.setPomFile( request.getPomFile() );
- }
- catch ( IOException | TransformerException | SAXException | ParserConfigurationException e )
- {
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V37 ).setException( e ) );
- }
- }
}
problems.setRootModel( inputModel );
@@ -680,6 +666,20 @@ public class DefaultModelBuilder
{
throw problems.newModelBuildingException();
}
+
+ if ( Features.buildConsumer().isActive() && pomFile != null )
+ {
+ try
+ {
+ model = modelProcessor.read( transformData( pomFile.toPath() ), null );
+
+ model.setPomFile( pomFile );
+ }
+ catch ( IOException | TransformerException | SAXException | ParserConfigurationException e )
+ {
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V37 ).setException( e ) );
+ }
+ }
return model;
}