[MNG-7228] MavenProject.getOriginalModel returns interpolated parts (#…

…1183)
apache · Jun 24, 2023 · dbfcfd5 · dbfcfd5
1 parent 7765635
commit dbfcfd5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -480,7 +480,7 @@ private boolean build(
             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
@@ -175,7 +175,7 @@ void testBuildPluginInterpolation() throws Exception {
         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 @@ void testReportingPluginInterpolation() throws Exception {
         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
@@ -658,7 +658,7 @@ protected ModelBuildingResult build(ModelBuildingRequest request, Collection<Str
         Model fileModel = readFileModel(request, problems);
 
         request.setFileModel(fileModel);
-        result.setFileModel(fileModel);
+        result.setFileModel(fileModel.clone());
 
         activateFileModel(request, result, problems);