From 9f61bb5b70fa7e07426b48f9c9202d3ef43d1a84 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 11 May 2026 13:30:41 +0200 Subject: [PATCH 1/2] Feat: Maven 3.10.x super POM Add entries from Maven 4 model 4.0.0 superpom, that are in essence sane defaults. --- .../main/resources/org/apache/maven/model/pom-4.0.0.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index 590297273d66..ae50f23e2d4a 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -23,6 +23,13 @@ under the License. 4.0.0 + + UTF-8 + UTF-8 + + 1980-02-01T00:00:00Z + + central From 026de9ae0d51888180d21624ce9fc50f95b912f4 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 11 May 2026 13:37:20 +0200 Subject: [PATCH 2/2] Fix UTs --- .../java/org/apache/maven/project/PomConstructionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9143b2db3f93..25bbfb60acb8 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 @@ -1243,7 +1243,7 @@ public void testReportingPluginConfig() throws Exception { @Test public void testPropertiesNoDuplication() throws Exception { PomTestWrapper pom = buildPom("properties-no-duplication/sub"); - assertEquals(1, ((Properties) pom.getValue("properties")).size()); + assertEquals(4, ((Properties) pom.getValue("properties")).size()); assertEquals("child", pom.getValue("properties/pomProfile")); } @@ -1367,7 +1367,7 @@ private void testCompleteModel(PomTestWrapper pom) throws Exception { assertEquals(1, ((List) pom.getValue("modules")).size()); assertEquals("sub", pom.getValue("modules[1]")); - assertEquals(1, ((Map) pom.getValue("properties")).size()); + assertEquals(4, ((Map) pom.getValue("properties")).size()); assertEquals("project-property", pom.getValue("properties[1]/itProperty")); assertEquals(1, ((List) pom.getValue("dependencyManagement/dependencies")).size());