[maven] branch master updated: [MNG-7228] MavenProject.getOriginalModel returns interpolated parts (#1183)

[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 dbfcfd5eb [MNG-7228] MavenProject.getOriginalModel returns 
interpolated parts (#1183)
dbfcfd5eb is described below

commit dbfcfd5eb3b958ccbc37b6707bf185adb4aa598c
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Sat Jun 24 10:51:08 2023 +0200

    [MNG-7228] MavenProject.getOriginalModel returns interpolated parts (#1183)
---
 .../src/main/java/org/apache/maven/project/DefaultProjectBuilder.java | 2 +-
 .../src/test/java/org/apache/maven/project/PomConstructionTest.java   | 4 ++--
 .../java/org/apache/maven/model/building/DefaultModelBuilder.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 1ec21e298..b5effa9d0 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -480,7 +480,7 @@ public class DefaultProjectBuilder implements 
ProjectBuilder {
             noErrors = false;
         }
 
-        Model model = result.getFileModel();
+        Model model = request.getFileModel();
 
         poolBuilder.put(model.getPomFile().toPath(), model);
 
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java 
b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index ecc63ad0e..feb65563f 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -175,7 +175,7 @@ class PomConstructionTest {
         assertEquals("||${project.basedir}||", 
originalModel.getProperties().get("prop-outside"));
 
         List<Plugin> outsidePlugins = originalModel.getBuild().getPlugins();
-        assertEquals(2, outsidePlugins.size());
+        assertEquals(1, outsidePlugins.size());
 
         checkBuildPluginWithArtifactId(
                 outsidePlugins,
@@ -270,7 +270,7 @@ class PomConstructionTest {
         assertEquals("||${project.basedir}||", 
originalModel.getProperties().get("prop-outside"));
 
         List<ReportPlugin> outsidePlugins = 
originalModel.getReporting().getPlugins();
-        assertEquals(2, outsidePlugins.size(), "Wrong number of plugins 
found");
+        assertEquals(1, outsidePlugins.size(), "Wrong number of plugins 
found");
 
         checkReportPluginWithArtifactId(
                 outsidePlugins,
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 50ac3f7c3..9f78ee230 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
@@ -658,7 +658,7 @@ public class DefaultModelBuilder implements ModelBuilder {
         Model fileModel = readFileModel(request, problems);
 
         request.setFileModel(fileModel);
-        result.setFileModel(fileModel);
+        result.setFileModel(fileModel.clone());
 
         activateFileModel(request, result, problems);