[maven] branch master updated: [MNG-7226] DefaultModelBuilder.buildRawModel fails (#528)

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet 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 76d7f58  [MNG-7226] DefaultModelBuilder.buildRawModel fails (#528)
76d7f58 is described below

commit 76d7f58a61eb6aea8d2e8b78551e5d500cc74f6e
Author: Mickael Istria <mist...@redhat.com>
AuthorDate: Fri Sep 3 09:56:30 2021 +0200

    [MNG-7226] DefaultModelBuilder.buildRawModel fails (#528)
    
    as it ignores pom file
---
 .../maven/model/building/DefaultModelBuilder.java   |  3 ++-
 .../model/building/DefaultModelBuilderTest.java     | 21 +++++++++++++++++----
 2 files changed, 19 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 213a7bd..b16819d 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
@@ -636,7 +636,8 @@ public class DefaultModelBuilder
     public Result<? extends Model> buildRawModel( File pomFile, int 
validationLevel, boolean locationTracking )
     {
         final ModelBuildingRequest request = new 
DefaultModelBuildingRequest().setValidationLevel( validationLevel )
-            .setLocationTracking( locationTracking );
+            .setLocationTracking( locationTracking )
+            .setModelSource( new FileModelSource( pomFile ) );
         final DefaultModelProblemCollector collector =
             new DefaultModelProblemCollector( new DefaultModelBuildingResult() 
);
         try
diff --git 
a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
 
b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
index d61e2aa..767f5fb 100644
--- 
a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
+++ 
b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
@@ -1,6 +1,11 @@
 package org.apache.maven.model.building;
 
-  /*
+  import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.File;
+
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,6 +25,7 @@ package org.apache.maven.model.building;
  */
 
 import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.resolution.InvalidRepositoryException;
@@ -27,9 +33,6 @@ import org.apache.maven.model.resolution.ModelResolver;
 import org.apache.maven.model.resolution.UnresolvableModelException;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 /**
  * @author Guillaume Nodet
  */
@@ -144,4 +147,14 @@ public class DefaultModelBuilderTest
         }
     }
 
+    @Test
+    public void testBuildRawModel()
+            throws Exception
+    {
+        ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
+        assertNotNull( builder );
+
+        Result<? extends Model> res = builder.buildRawModel( new File( 
getClass().getResource("/poms/factory/simple.xml" ).getFile() ), 
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL, false);
+        assertNotNull( res.get() );
+    }
 }