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 1ec21e298154..b5effa9d0658 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 @@ 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 index ecc63ad0e582..feb65563feeb 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 @@ void testBuildPluginInterpolation() throws Exception { assertEquals("||${project.basedir}||", originalModel.getProperties().get("prop-outside")); List 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 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 50ac3f7c3ef4..9f78ee2301b1 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 @@ protected ModelBuildingResult build(ModelBuildingRequest request, Collection