From b7ea8a459fb82fea0d47585f240b2f01294a4912 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 07:07:59 -0400 Subject: [PATCH 01/19] revert namespace --- .../invoker/mvnup/goals/UpgradeConstants.java | 6 ++-- .../mvnup/goals/InferenceStrategyTest.java | 30 +++++++++---------- .../mvnup/goals/ModelUpgradeStrategyTest.java | 12 ++++---- .../mvnup/goals/ModelVersionUtilsTest.java | 6 ++-- .../goals/UpgradeWorkflowIntegrationTest.java | 2 +- .../test/resources/consumer/simple/pom.xml | 4 +-- .../consumer/simple/simple-parent/pom.xml | 2 +- .../simple-parent/simple-testutils/pom.xml | 2 +- .../simple-parent/simple-weather/pom.xml | 2 +- .../simple/simple-parent/utils-parent/pom.xml | 2 +- .../resources/consumer/trivial/child/pom.xml | 2 +- .../test/resources/consumer/trivial/pom.xml | 2 +- .../pom.xml | 4 +-- .../subprojects-discover/child/pom.xml | 2 +- .../projects/subprojects-discover/pom.xml | 2 +- .../resources/projects/transform/before.pom | 4 +-- .../resources/projects/tree/consumer/pom.xml | 2 +- .../test/resources/projects/tree/dep/pom.xml | 2 +- .../src/test/resources/projects/tree/pom.xml | 2 +- .../impl/DefaultModelXmlFactoryTest.java | 4 +-- .../props-and-profiles-grand-parent.xml | 2 +- .../factory/props-and-profiles-parent.xml | 2 +- .../poms/factory/props-and-profiles.xml | 2 +- .../maven/model/v4/MavenStaxReaderTest.java | 4 +-- .../expected/parent-build.pom | 2 +- .../expected/simple-weather-build.pom | 2 +- .../expected/simple-webapp-build.pom | 2 +- .../resources/mng-6656-buildconsumer/pom.xml | 2 +- .../simple-parent/pom.xml | 2 +- .../simple-parent/simple-weather/pom.xml | 2 +- .../simple-parent/simple-webapp/pom.xml | 2 +- .../expected/parent-build.pom | 2 +- .../expected/simple-parent-build.pom | 2 +- .../expected/simple-testutils-build.pom | 2 +- .../expected/simple-weather-build.pom | 2 +- .../expected/simple-webapp-build.pom | 2 +- .../expected/utils-parent-build.pom | 2 +- .../resources/mng-6957-buildconsumer/pom.xml | 2 +- .../simple-parent/pom.xml | 2 +- .../simple-parent/simple-testutils/pom.xml | 2 +- .../simple-parent/simple-weather/pom.xml | 2 +- .../simple-parent/simple-webapp/pom.xml | 2 +- .../simple-parent/utils-parent/pom.xml | 2 +- .../mng-7038-rootdir/module-a/pom.xml | 2 +- .../resources/mng-7228-leaky-model/pom.xml | 2 +- .../mng-7255-inferred-groupid/child/pom.xml | 2 +- .../mng-7255-inferred-groupid/dep/pom.xml | 2 +- .../mng-7255-inferred-groupid/pom.xml | 2 +- .../resources/mng-7360-build-consumer/pom.xml | 2 +- .../mng-7804-plugin-execution-order/pom.xml | 2 +- .../build-extension/pom.xml | 2 +- .../core-extension/pom.xml | 2 +- .../extension/pom.xml | 2 +- .../b/pom.xml | 2 +- .../c/pom.xml | 2 +- .../d/pom.xml | 2 +- .../e/pom.xml | 2 +- .../pom.xml | 2 +- .../child/pom.xml | 2 +- .../parent/pom.xml | 2 +- .../resources/mng-8181-central-repo/pom.xml | 2 +- .../extensions/extension1/pom.xml | 2 +- .../extensions/extension2/pom.xml | 2 +- .../extensions/extension3/pom.xml | 2 +- .../extensions/extension4/pom.xml | 2 +- .../extensions/pom.xml | 2 +- .../mng-8220-extension-with-di/test/pom.xml | 2 +- .../cif-with-project-props/child/pom.xml | 2 +- .../cif-with-project-props/pom.xml | 2 +- .../cif-with-user-props/child/pom.xml | 2 +- .../cif-with-user-props/pom.xml | 2 +- .../exp-in-artifactid/pom.xml | 2 +- .../exp-in-groupid/pom.xml | 2 +- .../test/resources/mng-8244-phase-all/pom.xml | 2 +- .../mng-8245-before-after-phase-all/pom.xml | 2 +- .../bad-mismatch/child/pom.xml | 2 +- .../bad-mismatch/pom.xml | 2 +- .../bad-non-resolvable/pom.xml | 2 +- .../bad-wrong-path/pom.xml | 2 +- .../ok-using-empty/child/pom.xml | 2 +- .../ok-using-empty/pom.xml | 2 +- .../ok-using-gav/child/pom.xml | 2 +- .../ok-using-gav/pom.xml | 2 +- .../ok-using-path/child/pom.xml | 2 +- .../ok-using-path/pom.xml | 2 +- .../module-a/pom.xml | 2 +- .../module-b/pom.xml | 2 +- .../pom.xml | 2 +- .../mng-8341-deadlock/child1/pom.xml | 2 +- .../mng-8341-deadlock/child2/pom.xml | 2 +- .../mng-8341-deadlock/parent/pom.xml | 2 +- .../test/resources/mng-8341-deadlock/pom.xml | 2 +- .../test/resources/mng-8360/module1/pom.xml | 2 +- .../src/test/resources/mng-8360/pom.xml | 2 +- .../pom.xml | 2 +- .../resources/mng-8385/spi-consumer/pom.xml | 2 +- .../resources/mng-8385/spi-extension/pom.xml | 2 +- .../pom-preserving.xml | 4 +-- .../pom.xml | 2 +- .../src/test/resources/mng-8465/pom.xml | 2 +- .../src/test/resources/mng-8469/pom.xml | 2 +- .../mng-8525-maven-di-plugin/pom.xml | 2 +- .../src/it/hello-maven-plugin/pom.xml | 2 +- .../extension/pom.xml | 2 +- .../test/dummy-artifact-pom.xml | 2 +- .../mng-8572-di-type-handler/test/pom.xml | 2 +- .../mng-8645-consumer-pom-dep-mgmt/pom.xml | 2 +- .../test/resources/mng-8653/child-1/pom.xml | 2 +- .../test/resources/mng-8653/child-2/pom.xml | 2 +- .../src/test/resources/mng-8653/pom.xml | 2 +- 110 files changed, 139 insertions(+), 139 deletions(-) diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java index 8d49fcc76b7a..c2dc87910a35 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java @@ -177,11 +177,11 @@ private Files() { * Maven namespace constants. */ public static final class Namespaces { - /** Maven 4.0.0 namespace URI */ + /** Maven namespace URI */ public static final String MAVEN_4_0_0_NAMESPACE = "http://maven.apache.org/POM/4.0.0"; - /** Maven 4.1.0 namespace URI */ - public static final String MAVEN_4_1_0_NAMESPACE = "http://maven.apache.org/POM/4.1.0"; + /** Maven namespace URI */ + public static final String MAVEN_4_1_0_NAMESPACE = "http://maven.apache.org/POM/4.0.0"; private Namespaces() { // Utility class diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java index 766c30be58b3..85be99aee28e 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java @@ -131,7 +131,7 @@ class DependencyInferenceTests { @DisplayName("should remove dependency version for project artifact") void shouldRemoveDependencyVersionForProjectArtifact() throws Exception { String parentPomXml = PomBuilder.create() - .namespace("http://maven.apache.org/POM/4.1.0") + .namespace("http://maven.apache.org/POM/4.0.0") .modelVersion("4.1.0") .groupId("com.example") .artifactId("parent-project") @@ -140,7 +140,7 @@ void shouldRemoveDependencyVersionForProjectArtifact() throws Exception { .build(); String moduleAPomXml = PomBuilder.create() - .namespace("http://maven.apache.org/POM/4.1.0") + .namespace("http://maven.apache.org/POM/4.0.0") .modelVersion("4.1.0") .parent("com.example", "parent-project", "1.0.0") .artifactId("module-a") @@ -149,7 +149,7 @@ void shouldRemoveDependencyVersionForProjectArtifact() throws Exception { String moduleBPomXml = """ - + com.example parent-project @@ -202,7 +202,7 @@ void shouldKeepDependencyVersionForExternalArtifact() throws Exception { String modulePomXml = """ - + com.example my-module 1.0.0 @@ -237,7 +237,7 @@ void shouldKeepDependencyVersionForExternalArtifact() throws Exception { @DisplayName("should keep dependency version when version mismatch") void shouldKeepDependencyVersionWhenVersionMismatch() throws Exception { String moduleAPomXml = PomBuilder.create() - .namespace("http://maven.apache.org/POM/4.1.0") + .namespace("http://maven.apache.org/POM/4.0.0") .modelVersion("4.1.0") .groupId("com.example") .artifactId("module-a") @@ -245,7 +245,7 @@ void shouldKeepDependencyVersionWhenVersionMismatch() throws Exception { .build(); String moduleBPomXml = PomBuilder.create() - .namespace("http://maven.apache.org/POM/4.1.0") + .namespace("http://maven.apache.org/POM/4.0.0") .modelVersion("4.1.0") .groupId("com.example") .artifactId("module-b") @@ -283,7 +283,7 @@ void shouldHandlePluginDependencies() throws Exception { String moduleAPomXml = """ - + com.example module-a 1.0.0 @@ -293,7 +293,7 @@ void shouldHandlePluginDependencies() throws Exception { String moduleBPomXml = """ - + com.example module-b 1.0.0 @@ -350,7 +350,7 @@ void shouldRemoveParentGroupIdWhenChildDoesntHaveExplicitGroupId() throws Except String parentPomXml = """ - + 4.1.0 com.example parent-project @@ -361,7 +361,7 @@ void shouldRemoveParentGroupIdWhenChildDoesntHaveExplicitGroupId() throws Except String childPomXml = """ - + 4.1.0 com.example @@ -407,7 +407,7 @@ void shouldKeepParentGroupIdWhenChildHasExplicitGroupId() throws Exception { String parentPomXml = """ - + 4.1.0 com.example parent-project @@ -418,7 +418,7 @@ void shouldKeepParentGroupIdWhenChildHasExplicitGroupId() throws Exception { String childPomXml = """ - + 4.1.0 com.example @@ -459,7 +459,7 @@ void shouldNotTrimParentElementsWhenParentIsExternal() throws Exception { String childPomXml = """ - + 4.1.0 org.springframework.boot @@ -500,7 +500,7 @@ void shouldTrimParentElementsWhenParentIsInReactor() throws Exception { String parentPomXml = """ - + 4.1.0 com.example parent-project @@ -513,7 +513,7 @@ void shouldTrimParentElementsWhenParentIsInReactor() throws Exception { String childPomXml = """ - + 4.1.0 com.example diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java index 2a0c3c171980..10f1e404c390 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java @@ -176,15 +176,15 @@ private static Stream provideUpgradeScenarios() { "http://maven.apache.org/POM/4.0.0", "4.0.0", "4.1.0", - "http://maven.apache.org/POM/4.1.0", + "http://maven.apache.org/POM/4.0.0", "4.1.0", 1, "Should upgrade from 4.0.0 to 4.1.0"), Arguments.of( - "http://maven.apache.org/POM/4.1.0", + "http://maven.apache.org/POM/4.0.0", "4.1.0", "4.1.0", - "http://maven.apache.org/POM/4.1.0", + "http://maven.apache.org/POM/4.0.0", "4.1.0", 0, "Should not modify when already at target version"), @@ -192,7 +192,7 @@ private static Stream provideUpgradeScenarios() { "http://maven.apache.org/POM/4.0.0", null, "4.1.0", - "http://maven.apache.org/POM/4.1.0", + "http://maven.apache.org/POM/4.0.0", "4.1.0", 1, "Should add model version when missing")); @@ -237,7 +237,7 @@ void shouldUpdateNamespaceRecursively() throws Exception { // Verify namespace was updated recursively Element root = document.getRootElement(); - Namespace newNamespace = Namespace.getNamespace("http://maven.apache.org/POM/4.1.0"); + Namespace newNamespace = Namespace.getNamespace("http://maven.apache.org/POM/4.0.0"); assertEquals(newNamespace, root.getNamespace()); // Verify child elements namespace updated recursively @@ -334,7 +334,7 @@ void shouldFailWhenAttemptingDowngrade() throws Exception { String pomXml = """ - + 4.1.0 com.example test-project diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java index 215e6b8e48c9..d2226f017bb6 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java @@ -75,7 +75,7 @@ void shouldDetectModelVersionFromDocument() throws Exception { @DisplayName("should detect 4.1.0 model version") void shouldDetect410ModelVersion() throws Exception { String pomXml = PomBuilder.create() - .namespace("http://maven.apache.org/POM/4.1.0") + .namespace("http://maven.apache.org/POM/4.0.0") .modelVersion("4.1.0") .groupId("test") .artifactId("test") @@ -111,7 +111,7 @@ void shouldDetectVersionFromNamespaceWhenModelVersionMissing() throws Exception String pomXml = """ - + test test 1.0.0 @@ -417,7 +417,7 @@ void shouldHandleMissingModelVersion() throws Exception { @ValueSource( strings = { "http://maven.apache.org/POM/4.0.0", - "http://maven.apache.org/POM/4.1.0", + "http://maven.apache.org/POM/4.0.0", "https://maven.apache.org/POM/4.0.0", "https://maven.apache.org/POM/4.1.0" }) diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeWorkflowIntegrationTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeWorkflowIntegrationTest.java index 5a652d557ff7..354671a96f31 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeWorkflowIntegrationTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeWorkflowIntegrationTest.java @@ -88,7 +88,7 @@ void shouldUpgradeModelVersionWith41Option() throws Exception { // Verify POM was upgraded String upgradedPom = Files.readString(pomFile); assertTrue( - upgradedPom.contains("http://maven.apache.org/POM/4.1.0"), + upgradedPom.contains("http://maven.apache.org/POM/4.0.0"), "POM should be upgraded to 4.1.0 namespace"); } diff --git a/impl/maven-core/src/test/resources/consumer/simple/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/pom.xml index 73903014c17e..baebc01e4bfd 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/pom.xml @@ -17,8 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml index ef03c81f33dc..d72ea4369896 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml index 741f409447e7..202ae1b5b01a 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi utils-parent diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml index 9b28b8d7602a..9a0db068a446 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi simple-parent diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml index 1aa6b87d45a7..041156de2cc3 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi simple-parent diff --git a/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml index 25c05afa1d36..297f5f4ba4cb 100644 --- a/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml @@ -1,4 +1,4 @@ - + org.my.group parent diff --git a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml index c739cc33b9d2..6b741474f743 100644 --- a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml @@ -1,4 +1,4 @@ - + org.my.group parent 1.0-SNAPSHOT diff --git a/impl/maven-core/src/test/resources/projects/pom-parent-version-from-nested-properties/pom.xml b/impl/maven-core/src/test/resources/projects/pom-parent-version-from-nested-properties/pom.xml index dc232b74fa66..5ab25adbd46f 100644 --- a/impl/maven-core/src/test/resources/projects/pom-parent-version-from-nested-properties/pom.xml +++ b/impl/maven-core/src/test/resources/projects/pom-parent-version-from-nested-properties/pom.xml @@ -1,6 +1,6 @@ - 4.1.0 diff --git a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml index 4ec6c2320f17..8f6112ffbc95 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml @@ -1,4 +1,4 @@ - + subprojects-discover parent diff --git a/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml index 6567ad58f20f..18ba46729be6 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml @@ -1,4 +1,4 @@ - + subprojects-discover parent 1 diff --git a/impl/maven-core/src/test/resources/projects/transform/before.pom b/impl/maven-core/src/test/resources/projects/transform/before.pom index 0fe4e3787c3e..483e329f29c2 100644 --- a/impl/maven-core/src/test/resources/projects/transform/before.pom +++ b/impl/maven-core/src/test/resources/projects/transform/before.pom @@ -19,9 +19,9 @@ specific language governing permissions and limitations under the License. --> - 4.1.0 diff --git a/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml index 71597091b672..c52711230737 100644 --- a/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml @@ -1,4 +1,4 @@ - + org.apache.maven.ut diff --git a/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml b/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml index 93a3f45ef601..09ccb88d1d6b 100644 --- a/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml @@ -1,4 +1,4 @@ - + org.apache.maven.ut diff --git a/impl/maven-core/src/test/resources/projects/tree/pom.xml b/impl/maven-core/src/test/resources/projects/tree/pom.xml index 98996f3a09d0..f9a69b4710e8 100644 --- a/impl/maven-core/src/test/resources/projects/tree/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/pom.xml @@ -1,4 +1,4 @@ - + org.apache.maven.ut parent 1.0-SNAPSHOT diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java index 436d7b979876..68c18a5c9865 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java @@ -59,7 +59,7 @@ void testValidNamespaceWithModelVersion400() throws Exception { void testValidNamespaceWithModelVersion410() throws Exception { String xml = """ - + 4.1.0 """; @@ -68,7 +68,7 @@ void testValidNamespaceWithModelVersion410() throws Exception { Model model = factory.read(request); assertEquals("4.1.0", model.getModelVersion()); - assertEquals("http://maven.apache.org/POM/4.1.0", model.getNamespaceUri()); + assertEquals("http://maven.apache.org/POM/4.0.0", model.getNamespaceUri()); } @Test diff --git a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml index 26230696587a..38ace4ff50af 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.tests props-and-profiles-grand-parent 1.0-SNAPSHOT diff --git a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml index 00ffc6d0c936..59d4a2c5bcd4 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + props-and-profiles-grand-parent.xml diff --git a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml index 02fb63cfd0fb..2883dfda69c8 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + props-and-profiles-parent.xml diff --git a/impl/maven-support/src/test/java/org/apache/maven/model/v4/MavenStaxReaderTest.java b/impl/maven-support/src/test/java/org/apache/maven/model/v4/MavenStaxReaderTest.java index d88c3522e182..7630821e1c4c 100644 --- a/impl/maven-support/src/test/java/org/apache/maven/model/v4/MavenStaxReaderTest.java +++ b/impl/maven-support/src/test/java/org/apache/maven/model/v4/MavenStaxReaderTest.java @@ -69,7 +69,7 @@ void testNamespaceConsistency() throws XMLStreamException { @Test void testNamespaceInconsistencyThrows() { String xml = "\n" - + " \n" + + " \n" + " \n" + " \n" + " maven-test-plugin\n" @@ -80,7 +80,7 @@ void testNamespaceInconsistencyThrows() { XMLStreamException ex = assertThrows(XMLStreamException.class, () -> fromXml(xml)); assertTrue(ex.getMessage().contains("Unexpected namespace for element 'build'")); - assertTrue(ex.getMessage().contains("found 'http://maven.apache.org/POM/4.1.0'")); + assertTrue(ex.getMessage().contains("found 'http://maven.apache.org/POM'")); assertTrue(ex.getMessage().contains("expected 'http://maven.apache.org/POM/4.0.0'")); } diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom index 5cace7f2dab8..faf76a2c8fa0 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom index f5755d9da4c0..cbd3e9e2b422 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom index 279a689ab7f0..c73bbbe970f4 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml index a2886e367ff7..145029886799 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml index 11ef77ac40d1..66afea3cbbf1 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml index f5755d9da4c0..cbd3e9e2b422 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml index 279a689ab7f0..c73bbbe970f4 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom index e4713ea4fdbf..880897c5a684 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom index 87e8ac1100e9..34c68ce4db98 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom index b9e9b5efe392..59db1cd565ff 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + ../utils-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom index 7da8409ef31e..8845306fded0 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom index 30e55e7df753..ea8f4086c181 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom index fb8c07c2d1b7..8d0df3c966c6 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + utils-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml index e4713ea4fdbf..880897c5a684 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml index 87e8ac1100e9..34c68ce4db98 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.sonatype.mavenbook.multi parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml index b9e9b5efe392..59db1cd565ff 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + ../utils-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml index 7da8409ef31e..8845306fded0 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml index 30e55e7df753..ea8f4086c181 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml index fb8c07c2d1b7..8d0df3c966c6 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + utils-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml index 6ca592c68301..59561a6df5b3 100644 --- a/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng7038 diff --git a/its/core-it-suite/src/test/resources/mng-7228-leaky-model/pom.xml b/its/core-it-suite/src/test/resources/mng-7228-leaky-model/pom.xml index 2d620dc7e931..9df5d6c7cb87 100644 --- a/its/core-it-suite/src/test/resources/mng-7228-leaky-model/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7228-leaky-model/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 org.apache.maven.its.mng7228 diff --git a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml index 85d1a5d4c017..8ebedb336c94 100644 --- a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng7255 parent diff --git a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml index 0f1b35a5028f..697f50b16bcc 100644 --- a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng7255 parent diff --git a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml index 4c0d0ccfd30f..aedd9698e35f 100644 --- a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng7255 parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml index 127b9cbd2b28..3990c402b363 100644 --- a/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml @@ -17,7 +17,7 @@ limitations under the License. --> - + org.apache.maven.its.mng7360 parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml b/its/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml index c94a8dfdd308..b12c0f4d2149 100644 --- a/its/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7804-plugin-execution-order/pom.xml @@ -1,5 +1,5 @@ - + mng7804 plugin-execution-order diff --git a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml index 951402ade6db..7d12f9e5fbd4 100644 --- a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng7891 build-extension 0.0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml index 248798ee3a9c..781557c1d481 100644 --- a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng7891 core-extension 0.0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml index d145a989ecfe..0d2ca4eec824 100644 --- a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng7891 extension 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml index 80a68acb2968..10a1c564a941 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml index 1f36022d6111..38ce3156fa75 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml index 19306ca1545b..696df1ea9337 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml index 6f5e567489eb..08fdcd65e4e8 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml index 74737a491d03..3d16a49d35c1 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng7982 test 0.1 diff --git a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml index cd44675d64d2..757e2852dc68 100644 --- a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8133 parent diff --git a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml index a3fab582a1ee..164cd97f01d1 100644 --- a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8133 parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8181-central-repo/pom.xml b/its/core-it-suite/src/test/resources/mng-8181-central-repo/pom.xml index 51913cb00343..5be32d6ae5f9 100644 --- a/its/core-it-suite/src/test/resources/mng-8181-central-repo/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8181-central-repo/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml index c9a04440bfc2..99aa0000d7f5 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng8220 extension1 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml index fe30147d85f3..e6c28ef79d77 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng8220 extension2 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml index 9863e5096fb4..7349bc36617c 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng8220 extension3 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml index 7f1c50f0dd9a..d11b41e910e1 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng8220 extension4 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml index d5162b99ec34..4c4076b8b244 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng8220 parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/test/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/test/pom.xml index 4a7ac6264c39..e0d12c548970 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/test/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + org.apache.maven.its.mng8220 extension 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/child/pom.xml index c616a634d69c..05945529116a 100644 --- a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/child/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 child diff --git a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/pom.xml b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/pom.xml index 79f7f87d065c..adf81f0d8159 100644 --- a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-project-props/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 myGroup diff --git a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/child/pom.xml index c616a634d69c..05945529116a 100644 --- a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/child/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 child diff --git a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/pom.xml b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/pom.xml index fca8940a59a1..363e47c27caf 100644 --- a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/cif-with-user-props/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 myGroup diff --git a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-artifactid/pom.xml b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-artifactid/pom.xml index c47e5b1bd2c6..e65ab80c071c 100644 --- a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-artifactid/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-artifactid/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 myGroup diff --git a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-groupid/pom.xml b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-groupid/pom.xml index a3b08ae31362..775c95bb5681 100644 --- a/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-groupid/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8230-ci-friendly-and-gav/exp-in-groupid/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 ${foo} diff --git a/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml b/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml index 35250bb2292c..dc58b90314c7 100644 --- a/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its mng-8244 diff --git a/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml b/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml index 910de385d02f..a86b30b1c626 100644 --- a/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml @@ -1,5 +1,5 @@ - + org.apahce.maven.its mng-8245 diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml index f7dc05cb2394..4691e1983e81 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 bad-parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml index 754d2e57a3d1..d421f0ab288e 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml index 2422200ede8a..847b35716993 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml index 0917a0eb4488..307763176467 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml @@ -1,5 +1,5 @@ - + ../foo diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml index 6cc57c22abe7..e4a964bfe66e 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml @@ -1,5 +1,5 @@ - + myArtifact diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml index 754d2e57a3d1..d421f0ab288e 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml index bdd71eb2f3db..c4b4c6a3be9f 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml index 754d2e57a3d1..d421f0ab288e 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml index 4106bae8b467..7dc4b7773fcd 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml @@ -1,5 +1,5 @@ - + .. diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml index 754d2e57a3d1..d421f0ab288e 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml index 1fe9c4fd41f0..38f392f3163c 100644 --- a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its mng8331 diff --git a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml index 8597b953615b..fb7d13fc8a15 100644 --- a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its mng8331 diff --git a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml index 334128747fc2..f27d4acad5bd 100644 --- a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its mng8331 1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml index ec6599c2ec71..930d636d8aee 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8341 parent diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml index e2faba1ff947..190f45ce9171 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8341 parent diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml index a656236012c8..696e62e593f6 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml @@ -1,5 +1,5 @@ - + org.apache apache diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml index 28a7b94a4128..e49a88a38b4c 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8341 parent diff --git a/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml b/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml index 62ab3c3c225d..e319bcec61b1 100644 --- a/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml @@ -1,5 +1,5 @@ - + module1 pom diff --git a/its/core-it-suite/src/test/resources/mng-8360/pom.xml b/its/core-it-suite/src/test/resources/mng-8360/pom.xml index 29b733291ddb..c3816da3f8e1 100644 --- a/its/core-it-suite/src/test/resources/mng-8360/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8360/pom.xml @@ -1,5 +1,5 @@ - + com.github.mattnelson profiles 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml b/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml index 568ce855c788..dd978c64d6c6 100644 --- a/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8383 root diff --git a/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml index 0ef562eb2c6b..432afd91adeb 100644 --- a/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8385 spi-consumer diff --git a/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml b/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml index c31f9165c923..8147136dea74 100644 --- a/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8385 spi-extension diff --git a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml index d4d28e6429a6..dee308a8e307 100644 --- a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml +++ b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml @@ -1,6 +1,6 @@ - org.apache.maven.its diff --git a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml index 54dd2c4894ac..762213687f90 100644 --- a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its mng-8414 diff --git a/its/core-it-suite/src/test/resources/mng-8465/pom.xml b/its/core-it-suite/src/test/resources/mng-8465/pom.xml index d8e808d478e5..10864d2028e9 100644 --- a/its/core-it-suite/src/test/resources/mng-8465/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8465/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8465 test 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8469/pom.xml b/its/core-it-suite/src/test/resources/mng-8469/pom.xml index 07de5d7f6e44..cee261ed80c5 100644 --- a/its/core-it-suite/src/test/resources/mng-8469/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8469/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8469 test 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml index bbc21f6c9286..d2b89d7361ff 100644 --- a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.1.0 org.apache.maven.its.mng8525 diff --git a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/it/hello-maven-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/it/hello-maven-plugin/pom.xml index beb9791f692c..c6265e486f2d 100644 --- a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/it/hello-maven-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/it/hello-maven-plugin/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.1.0 org.apache.maven.plugins.mvn4.its diff --git a/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/extension/pom.xml index e952f05ba4da..982914ea7e10 100644 --- a/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/extension/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.1.0 org.apache.maven.its.mng8572 diff --git a/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/dummy-artifact-pom.xml b/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/dummy-artifact-pom.xml index 4bd7ecdad4a4..802059790d85 100644 --- a/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/dummy-artifact-pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/dummy-artifact-pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 org.apache.maven.its.mng8572 diff --git a/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/pom.xml b/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/pom.xml index 315ef25e188b..12f7617253d8 100644 --- a/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8572-di-type-handler/test/pom.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + 4.1.0 org.apache.maven.its.mng8572 diff --git a/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml b/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml index 6665c0f71227..0389838caefd 100644 --- a/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.its.mng8645 test 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml b/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml index 95b14b900670..abcd87d7f6a7 100644 --- a/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml @@ -1,5 +1,5 @@ - + child-1 pom diff --git a/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml b/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml index a37c0aab5649..3ab3e7611a23 100644 --- a/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml @@ -1,5 +1,5 @@ - + child-2 pom diff --git a/its/core-it-suite/src/test/resources/mng-8653/pom.xml b/its/core-it-suite/src/test/resources/mng-8653/pom.xml index 26d0cd54a268..43759b6b90fa 100644 --- a/its/core-it-suite/src/test/resources/mng-8653/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8653/pom.xml @@ -1,5 +1,5 @@ - + org.apache.maven.it.mng8653 parent From 0655cb7b8f3845b1035ae77fe881dc3809589c61 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 07:37:47 -0400 Subject: [PATCH 02/19] fix tests --- impl/maven-core/src/test/resources/consumer/simple/pom.xml | 1 + .../src/test/resources/consumer/simple/simple-parent/pom.xml | 1 + .../consumer/simple/simple-parent/simple-weather/pom.xml | 1 + impl/maven-core/src/test/resources/consumer/trivial/pom.xml | 1 + .../test/resources/projects/subprojects-discover/child/pom.xml | 1 + .../src/test/resources/projects/subprojects-discover/pom.xml | 1 + .../maven-core/src/test/resources/projects/tree/consumer/pom.xml | 1 + impl/maven-core/src/test/resources/projects/tree/pom.xml | 1 + .../mng-6656-buildconsumer/expected/simple-weather-build.pom | 1 + .../src/test/resources/mng-6656-buildconsumer/pom.xml | 1 + 10 files changed, 10 insertions(+) diff --git a/impl/maven-core/src/test/resources/consumer/simple/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/pom.xml index baebc01e4bfd..6c8f84060c57 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/pom.xml @@ -19,6 +19,7 @@ under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml index d72ea4369896..4ab9d18ed7f7 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml @@ -22,6 +22,7 @@ under the License. org.sonatype.mavenbook.multi parent + 4.1.0 simple-parent pom Multi Chapter Simple Parent Project diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml index 9a0db068a446..c022e3f29218 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml @@ -31,6 +31,7 @@ under the License. org.sonatype.mavenbook.multi simple-testutils + 0.9-MNG6656-SNAPSHOT test diff --git a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml index 6b741474f743..f0a86b6345b6 100644 --- a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml @@ -3,6 +3,7 @@ parent 1.0-SNAPSHOT pom + 4.1.0 child diff --git a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml index 8f6112ffbc95..0e120405c574 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml @@ -3,6 +3,7 @@ subprojects-discover parent + 4.1.0 child jar diff --git a/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml index 18ba46729be6..df5371c415fd 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml @@ -1,4 +1,5 @@ + 4.1.0 subprojects-discover parent 1 diff --git a/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml index c52711230737..a04df58b3693 100644 --- a/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml @@ -10,6 +10,7 @@ org.apache.maven.ut dep + 1.0-SNAPSHOT diff --git a/impl/maven-core/src/test/resources/projects/tree/pom.xml b/impl/maven-core/src/test/resources/projects/tree/pom.xml index f9a69b4710e8..bda3404ba31e 100644 --- a/impl/maven-core/src/test/resources/projects/tree/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/pom.xml @@ -1,4 +1,5 @@ + 4.1.0 org.apache.maven.ut parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom index cbd3e9e2b422..35c6ba3e14ca 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml index 145029886799..771dca9fd159 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT From 523d67cca0dcf7e6a44756c0561acd906258b060 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 07:55:37 -0400 Subject: [PATCH 03/19] tests --- .../mvnup/goals/ModelVersionUtils.java | 14 +---- .../mvnup/goals/InferenceStrategyTest.java | 3 + .../mvnup/goals/ModelUpgradeStrategyTest.java | 60 +------------------ .../mvnup/goals/ModelVersionUtilsTest.java | 18 ------ 4 files changed, 7 insertions(+), 88 deletions(-) diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtils.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtils.java index 8d3740778909..b8e7c9e4eb02 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtils.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtils.java @@ -24,8 +24,6 @@ import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.ModelVersions.MODEL_VERSION_4_0_0; import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.ModelVersions.MODEL_VERSION_4_1_0; -import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.Namespaces.MAVEN_4_0_0_NAMESPACE; -import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.Namespaces.MAVEN_4_1_0_NAMESPACE; import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.SchemaLocations.MAVEN_4_1_0_SCHEMA_LOCATION; import static org.apache.maven.cling.invoker.mvnup.goals.UpgradeConstants.XmlElements.MODEL_VERSION; @@ -40,7 +38,7 @@ private ModelVersionUtils() { /** * Detects the model version from a POM document. - * Uses both the modelVersion element and namespace URI for detection. + * Uses the modelVersion element for detection. * * @param pomDocument the POM document * @return the detected model version @@ -49,7 +47,7 @@ public static String detectModelVersion(Document pomDocument) { Element root = pomDocument.getRootElement(); Namespace namespace = root.getNamespace(); - // First try to get from modelVersion element + // Try to get from modelVersion element Element modelVersionElement = root.getChild(MODEL_VERSION, namespace); if (modelVersionElement != null) { String modelVersion = modelVersionElement.getTextTrim(); @@ -58,14 +56,6 @@ public static String detectModelVersion(Document pomDocument) { } } - // Fallback to namespace URI detection - String namespaceUri = namespace.getURI(); - if (MAVEN_4_1_0_NAMESPACE.equals(namespaceUri)) { - return MODEL_VERSION_4_1_0; - } else if (MAVEN_4_0_0_NAMESPACE.equals(namespaceUri)) { - return MODEL_VERSION_4_0_0; - } - // Default fallback return MODEL_VERSION_4_0_0; } diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java index 85be99aee28e..a87225f5c295 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java @@ -150,6 +150,7 @@ void shouldRemoveDependencyVersionForProjectArtifact() throws Exception { """ + 4.1.0 com.example parent-project @@ -284,6 +285,7 @@ void shouldHandlePluginDependencies() throws Exception { """ + 4.1.0 com.example module-a 1.0.0 @@ -294,6 +296,7 @@ void shouldHandlePluginDependencies() throws Exception { """ + 4.1.0 com.example module-b 1.0.0 diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java index 10f1e404c390..8e800affa862 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java @@ -132,7 +132,6 @@ void shouldHandleVariousModelVersionUpgradeScenarios( String initialNamespace, String initialModelVersion, String targetModelVersion, - String expectedNamespace, String expectedModelVersion, int expectedModifiedCount, String description) @@ -158,7 +157,6 @@ void shouldHandleVariousModelVersionUpgradeScenarios( // Verify the model version and namespace Element root = document.getRootElement(); - assertEquals(expectedNamespace, root.getNamespaceURI(), "Namespace should be updated: " + description); Element modelVersionElement = root.getChild("modelVersion", root.getNamespace()); if (expectedModelVersion != null) { @@ -176,7 +174,6 @@ private static Stream provideUpgradeScenarios() { "http://maven.apache.org/POM/4.0.0", "4.0.0", "4.1.0", - "http://maven.apache.org/POM/4.0.0", "4.1.0", 1, "Should upgrade from 4.0.0 to 4.1.0"), @@ -184,7 +181,6 @@ private static Stream provideUpgradeScenarios() { "http://maven.apache.org/POM/4.0.0", "4.1.0", "4.1.0", - "http://maven.apache.org/POM/4.0.0", "4.1.0", 0, "Should not modify when already at target version"), @@ -192,7 +188,6 @@ private static Stream provideUpgradeScenarios() { "http://maven.apache.org/POM/4.0.0", null, "4.1.0", - "http://maven.apache.org/POM/4.0.0", "4.1.0", 1, "Should add model version when missing")); @@ -200,59 +195,8 @@ private static Stream provideUpgradeScenarios() { } @Nested - @DisplayName("Namespace Updates") - class NamespaceUpdateTests { - - @Test - @DisplayName("should update namespace recursively") - void shouldUpdateNamespaceRecursively() throws Exception { - String pomXml = - """ - - - 4.0.0 - - - test - test - 1.0.0 - - - - """; - - Document document = saxBuilder.build(new StringReader(pomXml)); - Map pomMap = Map.of(Paths.get("pom.xml"), document); - - // Create context with --model-version=4.1.0 option to trigger namespace update - UpgradeOptions options = mock(UpgradeOptions.class); - when(options.modelVersion()).thenReturn(Optional.of("4.1.0")); - when(options.all()).thenReturn(Optional.empty()); - UpgradeContext context = createMockContext(options); - - UpgradeResult result = strategy.apply(context, pomMap); - - assertTrue(result.success(), "Model upgrade should succeed"); - assertTrue(result.modifiedCount() > 0, "Should have upgraded namespace"); - - // Verify namespace was updated recursively - Element root = document.getRootElement(); - Namespace newNamespace = Namespace.getNamespace("http://maven.apache.org/POM/4.0.0"); - assertEquals(newNamespace, root.getNamespace()); - - // Verify child elements namespace updated recursively - Element dependencies = root.getChild("dependencies", newNamespace); - assertNotNull(dependencies); - assertEquals(newNamespace, dependencies.getNamespace()); - - Element dependency = dependencies.getChild("dependency", newNamespace); - assertNotNull(dependency); - assertEquals(newNamespace, dependency.getNamespace()); - - Element groupId = dependency.getChild("groupId", newNamespace); - assertNotNull(groupId); - assertEquals(newNamespace, groupId.getNamespace()); - } + @DisplayName("Model Version Updates") + class ModelVersionUpdateTests { @Test @DisplayName("should convert modules to subprojects in 4.1.0") diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java index d2226f017bb6..13562ae25a1c 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java @@ -104,24 +104,6 @@ void shouldReturnDefaultVersionWhenModelVersionMissing() throws Exception { String result = ModelVersionUtils.detectModelVersion(document); assertEquals("4.0.0", result); // Default version } - - @Test - @DisplayName("should detect version from namespace when model version is missing") - void shouldDetectVersionFromNamespaceWhenModelVersionMissing() throws Exception { - String pomXml = - """ - - - test - test - 1.0.0 - - """; - - Document document = saxBuilder.build(new StringReader(pomXml)); - String result = ModelVersionUtils.detectModelVersion(document); - assertEquals("4.1.0", result); - } } @Nested From eb98d63546d2c23d0eeeac792af07839176a8a7c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 10:34:06 -0400 Subject: [PATCH 04/19] fix ITs --- .../mng-7038-rootdir/module-a/pom.xml | 1 + .../build-extension/pom.xml | 1 + .../core-extension/pom.xml | 2 + .../extension/pom.xml | 1 + .../pom.xml | 1 + .../bad-mismatch/pom.xml | 1 + .../ok-using-empty/pom.xml | 1 + .../ok-using-gav/pom.xml | 1 + .../ok-using-path/pom.xml | 1 + .../src/test/resources/mng-8360/pom.xml | 1 + .../src/test/resources/mng-8465/pom.xml | 1 + .../src/test/resources/mng-8469/pom.xml | 1 + .../mng-8645-consumer-pom-dep-mgmt/pom.xml | 1 + .../test/resources/mng-8653/child-1/pom.xml | 1 + .../test/resources/mng-8653/child-2/pom.xml | 1 + .../src/test/resources/mng-8653/pom.xml | 2 +- src/site/markdown/configuration.properties | 283 +++++++++--------- src/site/markdown/configuration.yaml | 2 +- src/site/markdown/maven-configuration.md | 2 +- 19 files changed, 156 insertions(+), 149 deletions(-) diff --git a/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml index 59561a6df5b3..7b5d67f40593 100644 --- a/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng7038 diff --git a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml index 7d12f9e5fbd4..939aede67e2a 100644 --- a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/build-extension/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng7891 build-extension 0.0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml index 781557c1d481..854a46a63df2 100644 --- a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/core-extension/pom.xml @@ -1,5 +1,7 @@ + 4.1.0 + org.apache.maven.its.mng7891 core-extension 0.0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml index 0d2ca4eec824..29c6a62c2a83 100644 --- a/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng7891 extension 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml index 3d16a49d35c1..9f945fe774f9 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng7982 test 0.1 diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml index d421f0ab288e..4386fb5e4613 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml index d421f0ab288e..4386fb5e4613 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml index d421f0ab288e..4386fb5e4613 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml index d421f0ab288e..4386fb5e4613 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 parent 0.1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8360/pom.xml b/its/core-it-suite/src/test/resources/mng-8360/pom.xml index c3816da3f8e1..0273aed2f239 100644 --- a/its/core-it-suite/src/test/resources/mng-8360/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8360/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 com.github.mattnelson profiles 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8465/pom.xml b/its/core-it-suite/src/test/resources/mng-8465/pom.xml index 10864d2028e9..edb4f3569c43 100644 --- a/its/core-it-suite/src/test/resources/mng-8465/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8465/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8465 test 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8469/pom.xml b/its/core-it-suite/src/test/resources/mng-8469/pom.xml index cee261ed80c5..03b0727598f7 100644 --- a/its/core-it-suite/src/test/resources/mng-8469/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8469/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8469 test 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml b/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml index 0389838caefd..0da96b845253 100644 --- a/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8645 test 1.0 diff --git a/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml b/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml index abcd87d7f6a7..519a58864f39 100644 --- a/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8653/child-1/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 child-1 pom diff --git a/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml b/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml index 3ab3e7611a23..5d36b643f33d 100644 --- a/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8653/child-2/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 child-2 pom diff --git a/its/core-it-suite/src/test/resources/mng-8653/pom.xml b/its/core-it-suite/src/test/resources/mng-8653/pom.xml index 43759b6b90fa..a4ad3858a19f 100644 --- a/its/core-it-suite/src/test/resources/mng-8653/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8653/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apache.maven.it.mng8653 parent 1.0.0 diff --git a/src/site/markdown/configuration.properties b/src/site/markdown/configuration.properties index 4cb611425f45..8aa644344baf 100644 --- a/src/site/markdown/configuration.properties +++ b/src/site/markdown/configuration.properties @@ -167,260 +167,251 @@ props.24.configurationSource = User properties props.25.key = maven.modelBuilder.interns props.25.configurationType = String props.25.description = Comma-separated list of XML contexts/fields to intern during POM parsing for memory optimization. When not specified, a default set of commonly repeated contexts will be used. Example: "groupId,artifactId,version,scope,type" -props.25.defaultValue = +props.25.defaultValue = props.25.since = 4.0.0 props.25.configurationSource = User properties props.26.key = maven.modelBuilder.parallelism -props.25.configurationType = Integer -props.25.description = ProjectBuilder parallelism. -props.25.defaultValue = cores/2 + 1 -props.25.since = 4.0.0 -props.25.configurationSource = User properties -props.26.key = maven.plugin.validation -props.26.configurationType = String -props.26.description = Plugin validation level. -props.26.defaultValue = inline -props.26.since = 3.9.2 +props.26.configurationType = Integer +props.26.description = ProjectBuilder parallelism. +props.26.defaultValue = cores/2 + 1 +props.26.since = 4.0.0 props.26.configurationSource = User properties -props.27.key = maven.plugin.validation.excludes +props.27.key = maven.plugin.validation props.27.configurationType = String -props.27.description = Plugin validation exclusions. -props.27.defaultValue = -props.27.since = 3.9.6 +props.27.description = Plugin validation level. +props.27.defaultValue = inline +props.27.since = 3.9.2 props.27.configurationSource = User properties -props.28.key = maven.project.conf +props.28.key = maven.plugin.validation.excludes props.28.configurationType = String -props.28.description = Maven project configuration directory. -props.28.defaultValue = ${session.rootDirectory}/.mvn -props.28.since = 4.0.0 +props.28.description = Plugin validation exclusions. +props.28.defaultValue = +props.28.since = 3.9.6 props.28.configurationSource = User properties -props.29.key = maven.project.extensions +props.29.key = maven.project.conf props.29.configurationType = String -props.29.description = Maven project extensions. -props.29.defaultValue = ${maven.project.conf}/extensions.xml +props.29.description = Maven project configuration directory. +props.29.defaultValue = ${session.rootDirectory}/.mvn props.29.since = 4.0.0 props.29.configurationSource = User properties -props.30.key = maven.project.settings +props.30.key = maven.project.extensions props.30.configurationType = String -props.30.description = Maven project settings. -props.30.defaultValue = ${maven.project.conf}/settings.xml +props.30.description = Maven project extensions. +props.30.defaultValue = ${maven.project.conf}/extensions.xml props.30.since = 4.0.0 props.30.configurationSource = User properties -props.31.key = maven.relocations.entries +props.31.key = maven.project.settings props.31.configurationType = String -props.31.description = User controlled relocations. This property is a comma separated list of entries with the syntax GAV>GAV. The first GAV can contain \* for any elem (so \*:\*:\* would mean ALL, something you don't want). The second GAV is either fully specified, or also can contain \*, then it behaves as "ordinary relocation": the coordinate is preserved from relocated artifact. Finally, if right hand GAV is absent (line looks like GAV>), the left hand matching GAV is banned fully (from resolving).
Note: the > means project level, while >> means global (whole session level, so even plugins will get relocated artifacts) relocation.
For example, 
maven.relocations.entries = org.foo:\*:\*>, \\
    org.here:\*:\*>org.there:\*:\*, \\
    javax.inject:javax.inject:1>>jakarta.inject:jakarta.inject:1.0.5
means: 3 entries, ban org.foo group (exactly, so org.foo.bar is allowed), relocate org.here to org.there and finally globally relocate (see >> above) javax.inject:javax.inject:1 to jakarta.inject:jakarta.inject:1.0.5. -props.31.defaultValue = +props.31.description = Maven project settings. +props.31.defaultValue = ${maven.project.conf}/settings.xml props.31.since = 4.0.0 props.31.configurationSource = User properties -props.32.key = maven.repo.central +props.32.key = maven.relocations.entries props.32.configurationType = String -props.32.description = Maven central repository URL. The property will have the value of the MAVEN_REPO_CENTRAL environment variable if it is defined. -props.32.defaultValue = https://repo.maven.apache.org/maven2 +props.32.description = User controlled relocations. This property is a comma separated list of entries with the syntax GAV>GAV. The first GAV can contain \* for any elem (so \*:\*:\* would mean ALL, something you don't want). The second GAV is either fully specified, or also can contain \*, then it behaves as "ordinary relocation": the coordinate is preserved from relocated artifact. Finally, if right hand GAV is absent (line looks like GAV>), the left hand matching GAV is banned fully (from resolving).
Note: the > means project level, while >> means global (whole session level, so even plugins will get relocated artifacts) relocation.
For example, 
maven.relocations.entries = org.foo:\*:\*>, \\
    org.here:\*:\*>org.there:\*:\*, \\
    javax.inject:javax.inject:1>>jakarta.inject:jakarta.inject:1.0.5
means: 3 entries, ban org.foo group (exactly, so org.foo.bar is allowed), relocate org.here to org.there and finally globally relocate (see >> above) javax.inject:javax.inject:1 to jakarta.inject:jakarta.inject:1.0.5. +props.32.defaultValue = props.32.since = 4.0.0 props.32.configurationSource = User properties -props.33.key = maven.repo.local +props.33.key = maven.repo.central props.33.configurationType = String -props.33.description = Maven local repository. -props.33.defaultValue = ${maven.user.conf}/repository -props.33.since = 3.0.0 +props.33.description = Maven central repository URL. The property will have the value of the MAVEN_REPO_CENTRAL environment variable if it is defined. +props.33.defaultValue = https://repo.maven.apache.org/maven2 +props.33.since = 4.0.0 props.33.configurationSource = User properties -props.34.key = maven.repo.local.head +props.34.key = maven.repo.local props.34.configurationType = String -props.34.description = User property for chained LRM: the new "head" local repository to use, and "push" the existing into tail. Similar to maven.repo.local.tail, this property may contain comma separated list of paths to be used as local repositories (combine with chained local repository), but while latter is "appending" this one is "prepending". -props.34.defaultValue = -props.34.since = 4.0.0 +props.34.description = Maven local repository. +props.34.defaultValue = ${maven.user.conf}/repository +props.34.since = 3.0.0 props.34.configurationSource = User properties -props.35.key = maven.repo.local.recordReverseTree +props.35.key = maven.repo.local.head props.35.configurationType = String -props.35.description = User property for reverse dependency tree. If enabled, Maven will record ".tracking" directory into local repository with "reverse dependency tree", essentially explaining WHY given artifact is present in local repository. Default: false, will not record anything. -props.35.defaultValue = false -props.35.since = 3.9.0 +props.35.description = User property for chained LRM: the new "head" local repository to use, and "push" the existing into tail. Similar to maven.repo.local.tail, this property may contain comma separated list of paths to be used as local repositories (combine with chained local repository), but while latter is "appending" this one is "prepending". +props.35.defaultValue = +props.35.since = 4.0.0 props.35.configurationSource = User properties -props.36.key = maven.repo.local.tail +props.36.key = maven.repo.local.recordReverseTree props.36.configurationType = String -props.36.description = User property for chained LRM: list of "tail" local repository paths (separated by comma), to be used with org.eclipse.aether.util.repository.ChainedLocalRepositoryManager. Default value: null, no chained LRM is used. -props.36.defaultValue = +props.36.description = User property for reverse dependency tree. If enabled, Maven will record ".tracking" directory into local repository with "reverse dependency tree", essentially explaining WHY given artifact is present in local repository. Default: false, will not record anything. +props.36.defaultValue = false props.36.since = 3.9.0 props.36.configurationSource = User properties -props.37.key = maven.repo.local.tail.ignoreAvailability +props.37.key = maven.repo.local.tail props.37.configurationType = String -props.37.description = User property for chained LRM: whether to ignore "availability check" in tail or not. Usually you do want to ignore it. This property is mapped onto corresponding Resolver 2.x property, is like a synonym for it. Default value: true. +props.37.description = User property for chained LRM: list of "tail" local repository paths (separated by comma), to be used with org.eclipse.aether.util.repository.ChainedLocalRepositoryManager. Default value: null, no chained LRM is used. props.37.defaultValue = props.37.since = 3.9.0 props.37.configurationSource = User properties -props.38.key = maven.resolver.dependencyManagerTransitivity +props.38.key = maven.repo.local.tail.ignoreAvailability props.38.configurationType = String -props.38.description = User property for selecting dependency manager behaviour regarding transitive dependencies and dependency management entries in their POMs. Maven 3 targeted full backward compatibility with Maven2, hence it ignored dependency management entries in transitive dependency POMs. Maven 4 enables "transitivity" by default, hence unlike Maven2, obeys dependency management entries deep in dependency graph as well.
Default: "true". -props.38.defaultValue = true -props.38.since = 4.0.0 +props.38.description = User property for chained LRM: whether to ignore "availability check" in tail or not. Usually you do want to ignore it. This property is mapped onto corresponding Resolver 2.x property, is like a synonym for it. Default value: true. +props.38.defaultValue = +props.38.since = 3.9.0 props.38.configurationSource = User properties -props.39.key = maven.resolver.transport +props.39.key = maven.resolver.dependencyManagerTransitivity props.39.configurationType = String -props.39.description = Resolver transport to use. Can be default, wagon, apache, jdk or auto. -props.39.defaultValue = default +props.39.description = User property for selecting dependency manager behaviour regarding transitive dependencies and dependency management entries in their POMs. Maven 3 targeted full backward compatibility with Maven2, hence it ignored dependency management entries in transitive dependency POMs. Maven 4 enables "transitivity" by default, hence unlike Maven2, obeys dependency management entries deep in dependency graph as well.
Default: "true". +props.39.defaultValue = true props.39.since = 4.0.0 props.39.configurationSource = User properties -props.40.key = maven.session.versionFilter +props.40.key = maven.resolver.transport props.40.configurationType = String -props.40.description = User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. -props.40.defaultValue = +props.40.description = Resolver transport to use. Can be default, wagon, apache, jdk or auto. +props.40.defaultValue = default props.40.since = 4.0.0 props.40.configurationSource = User properties -props.41.key = maven.settings.security +props.41.key = maven.session.versionFilter props.41.configurationType = String -props.41.description = -props.41.defaultValue = ${maven.user.conf}/settings-security4.xml +props.41.description = User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "ns" - unconditional snapshot filter (no snapshots selected from ranges)
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. +props.41.defaultValue = +props.41.since = 4.0.0 props.41.configurationSource = User properties -props.42.key = maven.startInstant -props.42.configurationType = java.time.Instant -props.42.description = User property used to store the build timestamp. -props.42.defaultValue = -props.42.since = 4.0.0 +props.42.key = maven.settings.security +props.42.configurationType = String +props.42.description = +props.42.defaultValue = ${maven.user.conf}/settings-security4.xml props.42.configurationSource = User properties -props.43.key = maven.style.color -props.43.configurationType = String -props.43.description = Maven output color mode. Allowed values are auto, always, never. -props.43.defaultValue = auto +props.43.key = maven.startInstant +props.43.configurationType = java.time.Instant +props.43.description = User property used to store the build timestamp. +props.43.defaultValue = props.43.since = 4.0.0 props.43.configurationSource = User properties -props.44.key = maven.style.debug +props.44.key = maven.style.color props.44.configurationType = String -props.44.description = Color style for debug messages. -props.44.defaultValue = bold,f:cyan +props.44.description = Maven output color mode. Allowed values are auto, always, never. +props.44.defaultValue = auto props.44.since = 4.0.0 props.44.configurationSource = User properties -props.45.key = maven.style.error +props.45.key = maven.style.debug props.45.configurationType = String -props.45.description = Color style for error messages. -props.45.defaultValue = bold,f:red +props.45.description = Color style for debug messages. +props.45.defaultValue = bold,f:cyan props.45.since = 4.0.0 props.45.configurationSource = User properties -props.46.key = maven.style.failure +props.46.key = maven.style.error props.46.configurationType = String -props.46.description = Color style for failure messages. +props.46.description = Color style for error messages. props.46.defaultValue = bold,f:red props.46.since = 4.0.0 props.46.configurationSource = User properties -props.47.key = maven.style.info +props.47.key = maven.style.failure props.47.configurationType = String -props.47.description = Color style for info messages. -props.47.defaultValue = bold,f:blue +props.47.description = Color style for failure messages. +props.47.defaultValue = bold,f:red props.47.since = 4.0.0 props.47.configurationSource = User properties -props.48.key = maven.style.mojo +props.48.key = maven.style.info props.48.configurationType = String -props.48.description = Color style for mojo messages. -props.48.defaultValue = f:green +props.48.description = Color style for info messages. +props.48.defaultValue = bold,f:blue props.48.since = 4.0.0 props.48.configurationSource = User properties -props.49.key = maven.style.project +props.49.key = maven.style.mojo props.49.configurationType = String -props.49.description = Color style for project messages. -props.49.defaultValue = f:cyan +props.49.description = Color style for mojo messages. +props.49.defaultValue = f:green props.49.since = 4.0.0 props.49.configurationSource = User properties -props.50.key = maven.style.strong +props.50.key = maven.style.project props.50.configurationType = String -props.50.description = Color style for strong messages. -props.50.defaultValue = bold +props.50.description = Color style for project messages. +props.50.defaultValue = f:cyan props.50.since = 4.0.0 props.50.configurationSource = User properties -props.51.key = maven.style.success +props.51.key = maven.style.strong props.51.configurationType = String -props.51.description = Color style for success messages. -props.51.defaultValue = bold,f:green +props.51.description = Color style for strong messages. +props.51.defaultValue = bold props.51.since = 4.0.0 props.51.configurationSource = User properties -props.52.key = maven.style.trace +props.52.key = maven.style.success props.52.configurationType = String -props.52.description = Color style for trace messages. -props.52.defaultValue = bold,f:magenta +props.52.description = Color style for success messages. +props.52.defaultValue = bold,f:green props.52.since = 4.0.0 props.52.configurationSource = User properties -props.53.key = maven.style.transfer +props.53.key = maven.style.trace props.53.configurationType = String -props.53.description = Color style for transfer messages. -props.53.defaultValue = f:bright-black +props.53.description = Color style for trace messages. +props.53.defaultValue = bold,f:magenta props.53.since = 4.0.0 props.53.configurationSource = User properties -props.54.key = maven.style.warning +props.54.key = maven.style.transfer props.54.configurationType = String -props.54.description = Color style for warning messages. -props.54.defaultValue = bold,f:yellow +props.54.description = Color style for transfer messages. +props.54.defaultValue = f:bright-black props.54.since = 4.0.0 props.54.configurationSource = User properties -props.55.key = maven.user.conf +props.55.key = maven.style.warning props.55.configurationType = String -props.55.description = Maven user configuration directory. -props.55.defaultValue = ${user.home}/.m2 +props.55.description = Color style for warning messages. +props.55.defaultValue = bold,f:yellow props.55.since = 4.0.0 props.55.configurationSource = User properties -props.56.key = maven.user.extensions +props.56.key = maven.user.conf props.56.configurationType = String -props.56.description = Maven user extensions. -props.56.defaultValue = ${maven.user.conf}/extensions.xml +props.56.description = Maven user configuration directory. +props.56.defaultValue = ${user.home}/.m2 props.56.since = 4.0.0 props.56.configurationSource = User properties -props.57.key = maven.user.settings +props.57.key = maven.user.extensions props.57.configurationType = String -props.57.description = Maven user settings. -props.57.defaultValue = ${maven.user.conf}/settings.xml +props.57.description = Maven user extensions. +props.57.defaultValue = ${maven.user.conf}/extensions.xml props.57.since = 4.0.0 props.57.configurationSource = User properties -props.58.key = maven.user.toolchains +props.58.key = maven.user.settings props.58.configurationType = String -props.58.description = Maven user toolchains. -props.58.defaultValue = ${maven.user.conf}/toolchains.xml +props.58.description = Maven user settings. +props.58.defaultValue = ${maven.user.conf}/settings.xml props.58.since = 4.0.0 props.58.configurationSource = User properties -props.59.key = maven.version +props.59.key = maven.user.toolchains props.59.configurationType = String -props.59.description = Maven version. -props.59.defaultValue = -props.59.since = 3.0.0 -props.59.configurationSource = system_properties -props.60.key = maven.version.major +props.59.description = Maven user toolchains. +props.59.defaultValue = ${maven.user.conf}/toolchains.xml +props.59.since = 4.0.0 +props.59.configurationSource = User properties +props.60.key = maven.version props.60.configurationType = String -props.60.description = Maven major version: contains the major segment of this Maven version. +props.60.description = Maven version. props.60.defaultValue = -props.60.since = 4.0.0 +props.60.since = 3.0.0 props.60.configurationSource = system_properties -props.61.key = maven.version.minor +props.61.key = maven.version.major props.61.configurationType = String -props.61.description = Maven minor version: contains the minor segment of this Maven version. +props.61.description = Maven major version: contains the major segment of this Maven version. props.61.defaultValue = props.61.since = 4.0.0 props.61.configurationSource = system_properties -props.62.key = maven.version.patch +props.62.key = maven.version.minor props.62.configurationType = String -props.62.description = Maven patch version: contains the patch segment of this Maven version. +props.62.description = Maven minor version: contains the minor segment of this Maven version. props.62.defaultValue = props.62.since = 4.0.0 props.62.configurationSource = system_properties -props.63.key = maven.version.snapshot +props.63.key = maven.version.patch props.63.configurationType = String -props.63.description = Maven snapshot: contains "true" if this Maven is a snapshot version. +props.63.description = Maven patch version: contains the patch segment of this Maven version. props.63.defaultValue = props.63.since = 4.0.0 props.63.configurationSource = system_properties -<<<<<<< HEAD -props.64.key = maven.versionRangeResolver.natureOverride +props.64.key = maven.version.snapshot props.64.configurationType = String -props.64.description = Configuration property for version range resolution used metadata "nature". It may contain following string values:
  • "auto" - decision done based on range being resolver: if any boundary is snapshot, use "release_or_snapshot", otherwise "release"
  • "release_or_snapshot" - the default
  • "release" - query only release repositories to discover versions
  • "snapshot" - query only snapshot repositories to discover versions
Default (when unset) is existing Maven behaviour: "release_or_snapshots". -props.64.defaultValue = release_or_snapshot +props.64.description = Maven snapshot: contains "true" if this Maven is a snapshot version. +props.64.defaultValue = props.64.since = 4.0.0 -props.64.configurationSource = User properties -props.65.key = maven.versionResolver.noCache -props.65.configurationType = Boolean -props.65.description = User property for disabling version resolver cache. -props.65.defaultValue = false -props.65.since = 3.0.0 +props.64.configurationSource = system_properties +props.65.key = maven.versionRangeResolver.natureOverride +props.65.configurationType = String +props.65.description = Configuration property for version range resolution used metadata "nature". It may contain following string values:
  • "auto" - decision done based on range being resolver: if any boundary is snapshot, use "release_or_snapshot", otherwise "release"
  • "release_or_snapshot" - the default
  • "release" - query only release repositories to discover versions
  • "snapshot" - query only snapshot repositories to discover versions
Default (when unset) is existing Maven behaviour: "release_or_snapshots". +props.65.defaultValue = release_or_snapshot +props.65.since = 4.0.0 props.65.configurationSource = User properties -======= -props.64.key = maven.versionResolver.noCache -props.64.configurationType = Boolean -props.64.description = User property for disabling version resolver cache. -props.64.defaultValue = false -props.64.since = 3.0.0 -props.64.configurationSource = User properties ->>>>>>> 4515e4e39b (Expand value interning optimization and add configurable session property) +props.66.key = maven.versionResolver.noCache +props.66.configurationType = Boolean +props.66.description = User property for disabling version resolver cache. +props.66.defaultValue = false +props.66.since = 3.0.0 +props.66.configurationSource = User properties diff --git a/src/site/markdown/configuration.yaml b/src/site/markdown/configuration.yaml index 20935442b805..dce74ca30fd2 100644 --- a/src/site/markdown/configuration.yaml +++ b/src/site/markdown/configuration.yaml @@ -262,7 +262,7 @@ props: configurationSource: User properties - key: maven.session.versionFilter configurationType: String - description: "User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • \"h\" or \"h(num)\" - highest version or top list of highest ones filter
  • \"l\" or \"l(num)\" - lowest version or bottom list of lowest ones filter
  • \"s\" - contextual snapshot filter
  • \"e(G:A:V)\" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: \"h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for \"top 5\" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance." + description: "User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • \"h\" or \"h(num)\" - highest version or top list of highest ones filter
  • \"l\" or \"l(num)\" - lowest version or bottom list of lowest ones filter
  • \"s\" - contextual snapshot filter
  • \"ns\" - unconditional snapshot filter (no snapshots selected from ranges)
  • \"e(G:A:V)\" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: \"h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for \"top 5\" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance." defaultValue: since: 4.0.0 configurationSource: User properties diff --git a/src/site/markdown/maven-configuration.md b/src/site/markdown/maven-configuration.md index a98d449cd9b3..1d159d282664 100644 --- a/src/site/markdown/maven-configuration.md +++ b/src/site/markdown/maven-configuration.md @@ -71,7 +71,7 @@ To modify this file, edit the template and regenerate. | `maven.repo.local.tail.ignoreAvailability` | `String` | User property for chained LRM: whether to ignore "availability check" in tail or not. Usually you do want to ignore it. This property is mapped onto corresponding Resolver 2.x property, is like a synonym for it. Default value: true. | - | 3.9.0 | User properties | | `maven.resolver.dependencyManagerTransitivity` | `String` | User property for selecting dependency manager behaviour regarding transitive dependencies and dependency management entries in their POMs. Maven 3 targeted full backward compatibility with Maven2, hence it ignored dependency management entries in transitive dependency POMs. Maven 4 enables "transitivity" by default, hence unlike Maven2, obeys dependency management entries deep in dependency graph as well.
Default: "true". | `true` | 4.0.0 | User properties | | `maven.resolver.transport` | `String` | Resolver transport to use. Can be default, wagon, apache, jdk or auto. | `default` | 4.0.0 | User properties | -| `maven.session.versionFilter` | `String` | User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. | - | 4.0.0 | User properties | +| `maven.session.versionFilter` | `String` | User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "ns" - unconditional snapshot filter (no snapshots selected from ranges)
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. | - | 4.0.0 | User properties | | `maven.settings.security` | `String` | | `${maven.user.conf}/settings-security4.xml` | | User properties | | `maven.startInstant` | `java.time.Instant` | User property used to store the build timestamp. | - | 4.0.0 | User properties | | `maven.style.color` | `String` | Maven output color mode. Allowed values are auto, always, never. | `auto` | 4.0.0 | User properties | From cf1c35d47dda15304fa9fb1cb282e5381b6e6083 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 11:22:05 -0400 Subject: [PATCH 05/19] fix IT --- .../mng-8414-consumer-pom-with-new-features/pom-preserving.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml index dee308a8e307..05944345873a 100644 --- a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml +++ b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom-preserving.xml @@ -2,7 +2,7 @@ - + 4.1.0 org.apache.maven.its mng-8414-preserving 1.0.0-SNAPSHOT From 91995f0fcc817dc9c887d279a97b973bfb6367eb Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 11:24:40 -0400 Subject: [PATCH 06/19] fix IT --- .../resources/mng-8414-consumer-pom-with-new-features/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml index 762213687f90..1860fc7d9fbf 100644 --- a/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8414-consumer-pom-with-new-features/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apache.maven.its mng-8414 1.0.0-SNAPSHOT From 202ecd1dc3ba43100b5b9082bcffcd1da0362d47 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 11:27:14 -0400 Subject: [PATCH 07/19] fix IT --- .../resources/mng-6656-buildconsumer/expected/parent-build.pom | 1 + .../mng-6656-buildconsumer/expected/simple-webapp-build.pom | 1 + .../test/resources/mng-6656-buildconsumer/simple-parent/pom.xml | 1 + .../mng-6957-buildconsumer/expected/simple-testutils-build.pom | 1 + 4 files changed, 4 insertions(+) diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom index faf76a2c8fa0..0cd8dba53069 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom index c73bbbe970f4..517c40326635 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml index 66afea3cbbf1..77dfa7a00875 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom index 59db1cd565ff..fd0362078ae6 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 ../utils-parent From f96feff8cf382b970d097b4510b89b4435a00cf8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 11:32:36 -0400 Subject: [PATCH 08/19] fix IT --- .../mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml | 1 + .../mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml index cbd3e9e2b422..35c6ba3e14ca 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml index c73bbbe970f4..517c40326635 100644 --- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-webapp From e05e5730edcdee413dbcfcaafba8a4ea66f3f90c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 13:06:41 -0400 Subject: [PATCH 09/19] fix IT --- .../test/resources/mng-8383-unknown-type-dependencies/pom.xml | 2 +- .../src/test/resources/mng-8385/spi-consumer/pom.xml | 2 +- .../src/test/resources/mng-8385/spi-extension/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml b/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml index dd978c64d6c6..4b085b37a8cd 100644 --- a/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apache.maven.its.mng8383 root 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml index 432afd91adeb..6ee8866dfd20 100644 --- a/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8385/spi-consumer/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apache.maven.its.mng8385 spi-consumer 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml b/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml index 8147136dea74..acdd708b8f25 100644 --- a/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8385/spi-extension/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apache.maven.its.mng8385 spi-extension 1.0.0-SNAPSHOT From 4621bcdc4e5c6bfad77a6b3408871b2bb161e317 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 13:13:06 -0400 Subject: [PATCH 10/19] fix IT --- its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml | 2 +- .../src/test/resources/mng-8245-before-after-phase-all/pom.xml | 2 +- .../src/test/resources/mng-8341-deadlock/child1/pom.xml | 1 + .../src/test/resources/mng-8341-deadlock/child2/pom.xml | 1 + .../src/test/resources/mng-8341-deadlock/parent/pom.xml | 1 + its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml b/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml index dc58b90314c7..fe592ebc8d9e 100644 --- a/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8244-phase-all/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apache.maven.its mng-8244 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml b/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml index a86b30b1c626..b31d39b0a10b 100644 --- a/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8245-before-after-phase-all/pom.xml @@ -1,6 +1,6 @@ - + 4.1.0 org.apahce.maven.its mng-8245 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml index 930d636d8aee..924e8a9381a0 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8341 parent diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml index 190f45ce9171..c65e3427f92f 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8341 parent diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml index 696e62e593f6..cae57732cec0 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache apache diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml index e49a88a38b4c..c02c53d13a9b 100644 --- a/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8341 parent From d935cb54fed467f75a135b96bf2dcc344c8f415d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 14:00:28 -0400 Subject: [PATCH 11/19] fix IT --- .../resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml | 1 + .../test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml | 1 + .../mng-8294-parent-checks/ok-using-empty/child/pom.xml | 1 + .../mng-8331-versioned-and-unversioned-deps/module-b/pom.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml index 847b35716993..dbc4fbe32a81 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml index 307763176467..678d5dab256d 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 ../foo diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml index e4a964bfe66e..e50e034f5d1f 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 myArtifact diff --git a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml index fb7d13fc8a15..f30a16380361 100644 --- a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its mng8331 From f13b8797a9a096af0c853184e52db6e3a4b458a4 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 14:58:59 -0400 Subject: [PATCH 12/19] fix mng-6957 --- .../resources/mng-6957-buildconsumer/expected/parent-build.pom | 1 + .../mng-6957-buildconsumer/expected/simple-parent-build.pom | 1 + .../mng-6957-buildconsumer/expected/simple-weather-build.pom | 1 + .../mng-6957-buildconsumer/expected/simple-webapp-build.pom | 1 + .../mng-6957-buildconsumer/expected/utils-parent-build.pom | 1 + .../src/test/resources/mng-6957-buildconsumer/pom.xml | 1 + .../simple-parent/simple-testutils/pom.xml | 1 + .../mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml | 1 + .../mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml | 1 + .../mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml | 1 + 10 files changed, 10 insertions(+) diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom index 880897c5a684..42ec14187c86 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom index 34c68ce4db98..abd1294a7c6a 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom index 8845306fded0..be76cc6547ba 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom index ea8f4086c181..c46ad69212c5 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom index 8d0df3c966c6..0fb74c91c3ce 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 utils-parent pom diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml index 880897c5a684..42ec14187c86 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent 0.9-${changelist}-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml index 59db1cd565ff..fd0362078ae6 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 ../utils-parent diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml index 8845306fded0..be76cc6547ba 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-weather jar diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml index ea8f4086c181..c46ad69212c5 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 simple-webapp diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml index 8d0df3c966c6..0fb74c91c3ce 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 utils-parent pom From 1f40af65312bb89e9f14b119238bc09b9cd3b631 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 16:27:49 -0400 Subject: [PATCH 13/19] fix IT --- .../test/resources/mng-6957-buildconsumer/simple-parent/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml index 34c68ce4db98..abd1294a7c6a 100644 --- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi parent From 2eef2bd94708c4f478717632682d508c079f21ac Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 16:49:20 -0400 Subject: [PATCH 14/19] fix IT --- .../consumer/simple/simple-parent/simple-testutils/pom.xml | 1 + .../consumer/simple/simple-parent/simple-weather/pom.xml | 1 + .../consumer/simple/simple-parent/utils-parent/pom.xml | 1 + .../src/test/resources/consumer/trivial/child/pom.xml | 1 + impl/maven-core/src/test/resources/consumer/trivial/pom.xml | 1 + .../test/resources/projects/subprojects-discover/child/pom.xml | 1 + .../src/test/resources/projects/tree/consumer/pom.xml | 3 +-- impl/maven-core/src/test/resources/projects/tree/dep/pom.xml | 2 +- .../mng-8294-parent-checks/bad-mismatch/child/pom.xml | 1 + .../mng-8294-parent-checks/ok-using-gav/child/pom.xml | 1 + .../mng-8294-parent-checks/ok-using-path/child/pom.xml | 1 + .../mng-8331-versioned-and-unversioned-deps/module-a/pom.xml | 1 + .../resources/mng-8331-versioned-and-unversioned-deps/pom.xml | 1 + its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml | 1 + 14 files changed, 14 insertions(+), 3 deletions(-) diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml index 202ae1b5b01a..ed1b421764b5 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi utils-parent diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml index c022e3f29218..da2e93ee1255 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi simple-parent diff --git a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml index 041156de2cc3..e02b7546e727 100644 --- a/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.sonatype.mavenbook.multi simple-parent diff --git a/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml index 297f5f4ba4cb..35c9e01b73e0 100644 --- a/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml @@ -1,4 +1,5 @@ + 4.1.0 org.my.group parent diff --git a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml index f0a86b6345b6..ef1c3c660281 100644 --- a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml @@ -1,4 +1,5 @@ + 4.1.0 org.my.group parent 1.0-SNAPSHOT diff --git a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml index 0e120405c574..18c35b14e851 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml @@ -1,4 +1,5 @@ + 4.1.0 subprojects-discover parent diff --git a/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml index a04df58b3693..2322a91c4d5d 100644 --- a/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 org.apache.maven.ut parent @@ -10,7 +10,6 @@ org.apache.maven.ut dep - 1.0-SNAPSHOT diff --git a/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml b/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml index 09ccb88d1d6b..50bf5d62a7f1 100644 --- a/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml +++ b/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 org.apache.maven.ut parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml index 4691e1983e81..324fb67512c9 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 bad-parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml index c4b4c6a3be9f..7122ce5571fe 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8294 parent diff --git a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml index 7dc4b7773fcd..91fad928f373 100644 --- a/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 .. diff --git a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml index 38f392f3163c..c4f3fb36f312 100644 --- a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-a/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its mng8331 diff --git a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml index f27d4acad5bd..5f0622623388 100644 --- a/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its mng8331 1-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml b/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml index e319bcec61b1..b672bbfc10dd 100644 --- a/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8360/module1/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 module1 pom From 13dd6f4c65ab9d822ecf11f5e713fa905a5f7620 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 16:55:38 -0400 Subject: [PATCH 15/19] fix IT --- .../resources/poms/factory/props-and-profiles-grand-parent.xml | 1 + .../test/resources/poms/factory/props-and-profiles-parent.xml | 1 + .../src/test/resources/poms/factory/props-and-profiles.xml | 1 + .../src/test/resources/mng-7255-inferred-groupid/child/pom.xml | 1 + .../src/test/resources/mng-7255-inferred-groupid/dep/pom.xml | 1 + .../src/test/resources/mng-7255-inferred-groupid/pom.xml | 1 + .../mng-7982-transitive-dependency-management/b/pom.xml | 1 + .../mng-7982-transitive-dependency-management/c/pom.xml | 1 + .../mng-7982-transitive-dependency-management/d/pom.xml | 1 + .../mng-7982-transitive-dependency-management/e/pom.xml | 1 + .../resources/mng-8133-root-directory-in-parent/child/pom.xml | 1 + .../resources/mng-8133-root-directory-in-parent/parent/pom.xml | 1 + .../mng-8220-extension-with-di/extensions/extension1/pom.xml | 1 + .../mng-8220-extension-with-di/extensions/extension2/pom.xml | 1 + 14 files changed, 14 insertions(+) diff --git a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml index 38ace4ff50af..0321a6fa98a5 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-grand-parent.xml @@ -16,6 +16,7 @@ limitations under the License. --> + 4.1.0 org.apache.maven.tests props-and-profiles-grand-parent 1.0-SNAPSHOT diff --git a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml index 59d4a2c5bcd4..9e33c7bc8533 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles-parent.xml @@ -16,6 +16,7 @@ limitations under the License. --> + 4.1.0 props-and-profiles-grand-parent.xml diff --git a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml index 2883dfda69c8..6c72ddf218fc 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/props-and-profiles.xml @@ -16,6 +16,7 @@ limitations under the License. --> + 4.1.0 props-and-profiles-parent.xml diff --git a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml index 8ebedb336c94..4591fb6b14a4 100644 --- a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/child/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng7255 parent diff --git a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml index 697f50b16bcc..8b567bb22250 100644 --- a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/dep/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng7255 parent diff --git a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml index aedd9698e35f..abc719fc5658 100644 --- a/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7255-inferred-groupid/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng7255 parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml index 10a1c564a941..10f1165db059 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml index 38ce3156fa75..9994c585fa7c 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/c/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml index 696df1ea9337..78afcce2bf21 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/d/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml index 08fdcd65e4e8..0c40490fd6c6 100644 --- a/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/e/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng7982 diff --git a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml index 757e2852dc68..bf8f9b82a9f8 100644 --- a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/child/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8133 parent diff --git a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml index 164cd97f01d1..56dd3ff3ac21 100644 --- a/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8133-root-directory-in-parent/parent/pom.xml @@ -1,5 +1,6 @@ + 4.1.0 org.apache.maven.its.mng8133 parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml index 99aa0000d7f5..c16df30db3c7 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension1/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng8220 extension1 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml index e6c28ef79d77..a407e89b289c 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension2/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng8220 extension2 1.0-SNAPSHOT From c16d2b40102d4bf2be74e761c21e4134043e9476 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 17:01:49 -0400 Subject: [PATCH 16/19] fix IT --- .../mng-8220-extension-with-di/extensions/extension3/pom.xml | 1 + .../mng-8220-extension-with-di/extensions/extension4/pom.xml | 1 + .../test/resources/mng-8220-extension-with-di/extensions/pom.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml index 7349bc36617c..4e3a4e0e961e 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng8220 extension3 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml index d11b41e910e1..1af6ba0dd25a 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension4/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng8220 extension4 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml index 4c4076b8b244..80e759c04f04 100644 --- a/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.1.0 org.apache.maven.its.mng8220 parent 1.0-SNAPSHOT From 66372a5eb0dcb9a62a28be679318a8a4efbe657c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 17:06:55 -0400 Subject: [PATCH 17/19] fix IT --- impl/maven-core/src/test/resources/consumer/trivial/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml index ef1c3c660281..aef499040640 100644 --- a/impl/maven-core/src/test/resources/consumer/trivial/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml @@ -4,7 +4,6 @@ parent 1.0-SNAPSHOT pom - 4.1.0 child From e14cc458c4434bc8bcb21c761c4200cf096871b4 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 19 Jul 2025 17:11:17 -0400 Subject: [PATCH 18/19] fix IT --- .../test/resources/projects/subprojects-discover/child/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml index 18c35b14e851..354acdd00808 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml @@ -4,7 +4,6 @@ subprojects-discover parent - 4.1.0 child jar From 356e21a2905ed808d0b75816326075913f4d14c0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 20 Jul 2025 07:13:45 -0400 Subject: [PATCH 19/19] revert unrelated docs --- src/site/markdown/configuration.properties | 283 +++++++++++---------- src/site/markdown/configuration.yaml | 2 +- src/site/markdown/maven-configuration.md | 2 +- 3 files changed, 148 insertions(+), 139 deletions(-) diff --git a/src/site/markdown/configuration.properties b/src/site/markdown/configuration.properties index 8aa644344baf..4cb611425f45 100644 --- a/src/site/markdown/configuration.properties +++ b/src/site/markdown/configuration.properties @@ -167,251 +167,260 @@ props.24.configurationSource = User properties props.25.key = maven.modelBuilder.interns props.25.configurationType = String props.25.description = Comma-separated list of XML contexts/fields to intern during POM parsing for memory optimization. When not specified, a default set of commonly repeated contexts will be used. Example: "groupId,artifactId,version,scope,type" -props.25.defaultValue = +props.25.defaultValue = props.25.since = 4.0.0 props.25.configurationSource = User properties props.26.key = maven.modelBuilder.parallelism -props.26.configurationType = Integer -props.26.description = ProjectBuilder parallelism. -props.26.defaultValue = cores/2 + 1 -props.26.since = 4.0.0 +props.25.configurationType = Integer +props.25.description = ProjectBuilder parallelism. +props.25.defaultValue = cores/2 + 1 +props.25.since = 4.0.0 +props.25.configurationSource = User properties +props.26.key = maven.plugin.validation +props.26.configurationType = String +props.26.description = Plugin validation level. +props.26.defaultValue = inline +props.26.since = 3.9.2 props.26.configurationSource = User properties -props.27.key = maven.plugin.validation +props.27.key = maven.plugin.validation.excludes props.27.configurationType = String -props.27.description = Plugin validation level. -props.27.defaultValue = inline -props.27.since = 3.9.2 +props.27.description = Plugin validation exclusions. +props.27.defaultValue = +props.27.since = 3.9.6 props.27.configurationSource = User properties -props.28.key = maven.plugin.validation.excludes +props.28.key = maven.project.conf props.28.configurationType = String -props.28.description = Plugin validation exclusions. -props.28.defaultValue = -props.28.since = 3.9.6 +props.28.description = Maven project configuration directory. +props.28.defaultValue = ${session.rootDirectory}/.mvn +props.28.since = 4.0.0 props.28.configurationSource = User properties -props.29.key = maven.project.conf +props.29.key = maven.project.extensions props.29.configurationType = String -props.29.description = Maven project configuration directory. -props.29.defaultValue = ${session.rootDirectory}/.mvn +props.29.description = Maven project extensions. +props.29.defaultValue = ${maven.project.conf}/extensions.xml props.29.since = 4.0.0 props.29.configurationSource = User properties -props.30.key = maven.project.extensions +props.30.key = maven.project.settings props.30.configurationType = String -props.30.description = Maven project extensions. -props.30.defaultValue = ${maven.project.conf}/extensions.xml +props.30.description = Maven project settings. +props.30.defaultValue = ${maven.project.conf}/settings.xml props.30.since = 4.0.0 props.30.configurationSource = User properties -props.31.key = maven.project.settings +props.31.key = maven.relocations.entries props.31.configurationType = String -props.31.description = Maven project settings. -props.31.defaultValue = ${maven.project.conf}/settings.xml +props.31.description = User controlled relocations. This property is a comma separated list of entries with the syntax GAV>GAV. The first GAV can contain \* for any elem (so \*:\*:\* would mean ALL, something you don't want). The second GAV is either fully specified, or also can contain \*, then it behaves as "ordinary relocation": the coordinate is preserved from relocated artifact. Finally, if right hand GAV is absent (line looks like GAV>), the left hand matching GAV is banned fully (from resolving).
Note: the > means project level, while >> means global (whole session level, so even plugins will get relocated artifacts) relocation.
For example, 
maven.relocations.entries = org.foo:\*:\*>, \\
    org.here:\*:\*>org.there:\*:\*, \\
    javax.inject:javax.inject:1>>jakarta.inject:jakarta.inject:1.0.5
means: 3 entries, ban org.foo group (exactly, so org.foo.bar is allowed), relocate org.here to org.there and finally globally relocate (see >> above) javax.inject:javax.inject:1 to jakarta.inject:jakarta.inject:1.0.5. +props.31.defaultValue = props.31.since = 4.0.0 props.31.configurationSource = User properties -props.32.key = maven.relocations.entries +props.32.key = maven.repo.central props.32.configurationType = String -props.32.description = User controlled relocations. This property is a comma separated list of entries with the syntax GAV>GAV. The first GAV can contain \* for any elem (so \*:\*:\* would mean ALL, something you don't want). The second GAV is either fully specified, or also can contain \*, then it behaves as "ordinary relocation": the coordinate is preserved from relocated artifact. Finally, if right hand GAV is absent (line looks like GAV>), the left hand matching GAV is banned fully (from resolving).
Note: the > means project level, while >> means global (whole session level, so even plugins will get relocated artifacts) relocation.
For example, 
maven.relocations.entries = org.foo:\*:\*>, \\
    org.here:\*:\*>org.there:\*:\*, \\
    javax.inject:javax.inject:1>>jakarta.inject:jakarta.inject:1.0.5
means: 3 entries, ban org.foo group (exactly, so org.foo.bar is allowed), relocate org.here to org.there and finally globally relocate (see >> above) javax.inject:javax.inject:1 to jakarta.inject:jakarta.inject:1.0.5. -props.32.defaultValue = +props.32.description = Maven central repository URL. The property will have the value of the MAVEN_REPO_CENTRAL environment variable if it is defined. +props.32.defaultValue = https://repo.maven.apache.org/maven2 props.32.since = 4.0.0 props.32.configurationSource = User properties -props.33.key = maven.repo.central +props.33.key = maven.repo.local props.33.configurationType = String -props.33.description = Maven central repository URL. The property will have the value of the MAVEN_REPO_CENTRAL environment variable if it is defined. -props.33.defaultValue = https://repo.maven.apache.org/maven2 -props.33.since = 4.0.0 +props.33.description = Maven local repository. +props.33.defaultValue = ${maven.user.conf}/repository +props.33.since = 3.0.0 props.33.configurationSource = User properties -props.34.key = maven.repo.local +props.34.key = maven.repo.local.head props.34.configurationType = String -props.34.description = Maven local repository. -props.34.defaultValue = ${maven.user.conf}/repository -props.34.since = 3.0.0 +props.34.description = User property for chained LRM: the new "head" local repository to use, and "push" the existing into tail. Similar to maven.repo.local.tail, this property may contain comma separated list of paths to be used as local repositories (combine with chained local repository), but while latter is "appending" this one is "prepending". +props.34.defaultValue = +props.34.since = 4.0.0 props.34.configurationSource = User properties -props.35.key = maven.repo.local.head +props.35.key = maven.repo.local.recordReverseTree props.35.configurationType = String -props.35.description = User property for chained LRM: the new "head" local repository to use, and "push" the existing into tail. Similar to maven.repo.local.tail, this property may contain comma separated list of paths to be used as local repositories (combine with chained local repository), but while latter is "appending" this one is "prepending". -props.35.defaultValue = -props.35.since = 4.0.0 +props.35.description = User property for reverse dependency tree. If enabled, Maven will record ".tracking" directory into local repository with "reverse dependency tree", essentially explaining WHY given artifact is present in local repository. Default: false, will not record anything. +props.35.defaultValue = false +props.35.since = 3.9.0 props.35.configurationSource = User properties -props.36.key = maven.repo.local.recordReverseTree +props.36.key = maven.repo.local.tail props.36.configurationType = String -props.36.description = User property for reverse dependency tree. If enabled, Maven will record ".tracking" directory into local repository with "reverse dependency tree", essentially explaining WHY given artifact is present in local repository. Default: false, will not record anything. -props.36.defaultValue = false +props.36.description = User property for chained LRM: list of "tail" local repository paths (separated by comma), to be used with org.eclipse.aether.util.repository.ChainedLocalRepositoryManager. Default value: null, no chained LRM is used. +props.36.defaultValue = props.36.since = 3.9.0 props.36.configurationSource = User properties -props.37.key = maven.repo.local.tail +props.37.key = maven.repo.local.tail.ignoreAvailability props.37.configurationType = String -props.37.description = User property for chained LRM: list of "tail" local repository paths (separated by comma), to be used with org.eclipse.aether.util.repository.ChainedLocalRepositoryManager. Default value: null, no chained LRM is used. +props.37.description = User property for chained LRM: whether to ignore "availability check" in tail or not. Usually you do want to ignore it. This property is mapped onto corresponding Resolver 2.x property, is like a synonym for it. Default value: true. props.37.defaultValue = props.37.since = 3.9.0 props.37.configurationSource = User properties -props.38.key = maven.repo.local.tail.ignoreAvailability +props.38.key = maven.resolver.dependencyManagerTransitivity props.38.configurationType = String -props.38.description = User property for chained LRM: whether to ignore "availability check" in tail or not. Usually you do want to ignore it. This property is mapped onto corresponding Resolver 2.x property, is like a synonym for it. Default value: true. -props.38.defaultValue = -props.38.since = 3.9.0 +props.38.description = User property for selecting dependency manager behaviour regarding transitive dependencies and dependency management entries in their POMs. Maven 3 targeted full backward compatibility with Maven2, hence it ignored dependency management entries in transitive dependency POMs. Maven 4 enables "transitivity" by default, hence unlike Maven2, obeys dependency management entries deep in dependency graph as well.
Default: "true". +props.38.defaultValue = true +props.38.since = 4.0.0 props.38.configurationSource = User properties -props.39.key = maven.resolver.dependencyManagerTransitivity +props.39.key = maven.resolver.transport props.39.configurationType = String -props.39.description = User property for selecting dependency manager behaviour regarding transitive dependencies and dependency management entries in their POMs. Maven 3 targeted full backward compatibility with Maven2, hence it ignored dependency management entries in transitive dependency POMs. Maven 4 enables "transitivity" by default, hence unlike Maven2, obeys dependency management entries deep in dependency graph as well.
Default: "true". -props.39.defaultValue = true +props.39.description = Resolver transport to use. Can be default, wagon, apache, jdk or auto. +props.39.defaultValue = default props.39.since = 4.0.0 props.39.configurationSource = User properties -props.40.key = maven.resolver.transport +props.40.key = maven.session.versionFilter props.40.configurationType = String -props.40.description = Resolver transport to use. Can be default, wagon, apache, jdk or auto. -props.40.defaultValue = default +props.40.description = User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. +props.40.defaultValue = props.40.since = 4.0.0 props.40.configurationSource = User properties -props.41.key = maven.session.versionFilter +props.41.key = maven.settings.security props.41.configurationType = String -props.41.description = User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "ns" - unconditional snapshot filter (no snapshots selected from ranges)
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. -props.41.defaultValue = -props.41.since = 4.0.0 +props.41.description = +props.41.defaultValue = ${maven.user.conf}/settings-security4.xml props.41.configurationSource = User properties -props.42.key = maven.settings.security -props.42.configurationType = String -props.42.description = -props.42.defaultValue = ${maven.user.conf}/settings-security4.xml +props.42.key = maven.startInstant +props.42.configurationType = java.time.Instant +props.42.description = User property used to store the build timestamp. +props.42.defaultValue = +props.42.since = 4.0.0 props.42.configurationSource = User properties -props.43.key = maven.startInstant -props.43.configurationType = java.time.Instant -props.43.description = User property used to store the build timestamp. -props.43.defaultValue = +props.43.key = maven.style.color +props.43.configurationType = String +props.43.description = Maven output color mode. Allowed values are auto, always, never. +props.43.defaultValue = auto props.43.since = 4.0.0 props.43.configurationSource = User properties -props.44.key = maven.style.color +props.44.key = maven.style.debug props.44.configurationType = String -props.44.description = Maven output color mode. Allowed values are auto, always, never. -props.44.defaultValue = auto +props.44.description = Color style for debug messages. +props.44.defaultValue = bold,f:cyan props.44.since = 4.0.0 props.44.configurationSource = User properties -props.45.key = maven.style.debug +props.45.key = maven.style.error props.45.configurationType = String -props.45.description = Color style for debug messages. -props.45.defaultValue = bold,f:cyan +props.45.description = Color style for error messages. +props.45.defaultValue = bold,f:red props.45.since = 4.0.0 props.45.configurationSource = User properties -props.46.key = maven.style.error +props.46.key = maven.style.failure props.46.configurationType = String -props.46.description = Color style for error messages. +props.46.description = Color style for failure messages. props.46.defaultValue = bold,f:red props.46.since = 4.0.0 props.46.configurationSource = User properties -props.47.key = maven.style.failure +props.47.key = maven.style.info props.47.configurationType = String -props.47.description = Color style for failure messages. -props.47.defaultValue = bold,f:red +props.47.description = Color style for info messages. +props.47.defaultValue = bold,f:blue props.47.since = 4.0.0 props.47.configurationSource = User properties -props.48.key = maven.style.info +props.48.key = maven.style.mojo props.48.configurationType = String -props.48.description = Color style for info messages. -props.48.defaultValue = bold,f:blue +props.48.description = Color style for mojo messages. +props.48.defaultValue = f:green props.48.since = 4.0.0 props.48.configurationSource = User properties -props.49.key = maven.style.mojo +props.49.key = maven.style.project props.49.configurationType = String -props.49.description = Color style for mojo messages. -props.49.defaultValue = f:green +props.49.description = Color style for project messages. +props.49.defaultValue = f:cyan props.49.since = 4.0.0 props.49.configurationSource = User properties -props.50.key = maven.style.project +props.50.key = maven.style.strong props.50.configurationType = String -props.50.description = Color style for project messages. -props.50.defaultValue = f:cyan +props.50.description = Color style for strong messages. +props.50.defaultValue = bold props.50.since = 4.0.0 props.50.configurationSource = User properties -props.51.key = maven.style.strong +props.51.key = maven.style.success props.51.configurationType = String -props.51.description = Color style for strong messages. -props.51.defaultValue = bold +props.51.description = Color style for success messages. +props.51.defaultValue = bold,f:green props.51.since = 4.0.0 props.51.configurationSource = User properties -props.52.key = maven.style.success +props.52.key = maven.style.trace props.52.configurationType = String -props.52.description = Color style for success messages. -props.52.defaultValue = bold,f:green +props.52.description = Color style for trace messages. +props.52.defaultValue = bold,f:magenta props.52.since = 4.0.0 props.52.configurationSource = User properties -props.53.key = maven.style.trace +props.53.key = maven.style.transfer props.53.configurationType = String -props.53.description = Color style for trace messages. -props.53.defaultValue = bold,f:magenta +props.53.description = Color style for transfer messages. +props.53.defaultValue = f:bright-black props.53.since = 4.0.0 props.53.configurationSource = User properties -props.54.key = maven.style.transfer +props.54.key = maven.style.warning props.54.configurationType = String -props.54.description = Color style for transfer messages. -props.54.defaultValue = f:bright-black +props.54.description = Color style for warning messages. +props.54.defaultValue = bold,f:yellow props.54.since = 4.0.0 props.54.configurationSource = User properties -props.55.key = maven.style.warning +props.55.key = maven.user.conf props.55.configurationType = String -props.55.description = Color style for warning messages. -props.55.defaultValue = bold,f:yellow +props.55.description = Maven user configuration directory. +props.55.defaultValue = ${user.home}/.m2 props.55.since = 4.0.0 props.55.configurationSource = User properties -props.56.key = maven.user.conf +props.56.key = maven.user.extensions props.56.configurationType = String -props.56.description = Maven user configuration directory. -props.56.defaultValue = ${user.home}/.m2 +props.56.description = Maven user extensions. +props.56.defaultValue = ${maven.user.conf}/extensions.xml props.56.since = 4.0.0 props.56.configurationSource = User properties -props.57.key = maven.user.extensions +props.57.key = maven.user.settings props.57.configurationType = String -props.57.description = Maven user extensions. -props.57.defaultValue = ${maven.user.conf}/extensions.xml +props.57.description = Maven user settings. +props.57.defaultValue = ${maven.user.conf}/settings.xml props.57.since = 4.0.0 props.57.configurationSource = User properties -props.58.key = maven.user.settings +props.58.key = maven.user.toolchains props.58.configurationType = String -props.58.description = Maven user settings. -props.58.defaultValue = ${maven.user.conf}/settings.xml +props.58.description = Maven user toolchains. +props.58.defaultValue = ${maven.user.conf}/toolchains.xml props.58.since = 4.0.0 props.58.configurationSource = User properties -props.59.key = maven.user.toolchains +props.59.key = maven.version props.59.configurationType = String -props.59.description = Maven user toolchains. -props.59.defaultValue = ${maven.user.conf}/toolchains.xml -props.59.since = 4.0.0 -props.59.configurationSource = User properties -props.60.key = maven.version +props.59.description = Maven version. +props.59.defaultValue = +props.59.since = 3.0.0 +props.59.configurationSource = system_properties +props.60.key = maven.version.major props.60.configurationType = String -props.60.description = Maven version. +props.60.description = Maven major version: contains the major segment of this Maven version. props.60.defaultValue = -props.60.since = 3.0.0 +props.60.since = 4.0.0 props.60.configurationSource = system_properties -props.61.key = maven.version.major +props.61.key = maven.version.minor props.61.configurationType = String -props.61.description = Maven major version: contains the major segment of this Maven version. +props.61.description = Maven minor version: contains the minor segment of this Maven version. props.61.defaultValue = props.61.since = 4.0.0 props.61.configurationSource = system_properties -props.62.key = maven.version.minor +props.62.key = maven.version.patch props.62.configurationType = String -props.62.description = Maven minor version: contains the minor segment of this Maven version. +props.62.description = Maven patch version: contains the patch segment of this Maven version. props.62.defaultValue = props.62.since = 4.0.0 props.62.configurationSource = system_properties -props.63.key = maven.version.patch +props.63.key = maven.version.snapshot props.63.configurationType = String -props.63.description = Maven patch version: contains the patch segment of this Maven version. +props.63.description = Maven snapshot: contains "true" if this Maven is a snapshot version. props.63.defaultValue = props.63.since = 4.0.0 props.63.configurationSource = system_properties -props.64.key = maven.version.snapshot +<<<<<<< HEAD +props.64.key = maven.versionRangeResolver.natureOverride props.64.configurationType = String -props.64.description = Maven snapshot: contains "true" if this Maven is a snapshot version. -props.64.defaultValue = +props.64.description = Configuration property for version range resolution used metadata "nature". It may contain following string values:
  • "auto" - decision done based on range being resolver: if any boundary is snapshot, use "release_or_snapshot", otherwise "release"
  • "release_or_snapshot" - the default
  • "release" - query only release repositories to discover versions
  • "snapshot" - query only snapshot repositories to discover versions
Default (when unset) is existing Maven behaviour: "release_or_snapshots". +props.64.defaultValue = release_or_snapshot props.64.since = 4.0.0 -props.64.configurationSource = system_properties -props.65.key = maven.versionRangeResolver.natureOverride -props.65.configurationType = String -props.65.description = Configuration property for version range resolution used metadata "nature". It may contain following string values:
  • "auto" - decision done based on range being resolver: if any boundary is snapshot, use "release_or_snapshot", otherwise "release"
  • "release_or_snapshot" - the default
  • "release" - query only release repositories to discover versions
  • "snapshot" - query only snapshot repositories to discover versions
Default (when unset) is existing Maven behaviour: "release_or_snapshots". -props.65.defaultValue = release_or_snapshot -props.65.since = 4.0.0 +props.64.configurationSource = User properties +props.65.key = maven.versionResolver.noCache +props.65.configurationType = Boolean +props.65.description = User property for disabling version resolver cache. +props.65.defaultValue = false +props.65.since = 3.0.0 props.65.configurationSource = User properties -props.66.key = maven.versionResolver.noCache -props.66.configurationType = Boolean -props.66.description = User property for disabling version resolver cache. -props.66.defaultValue = false -props.66.since = 3.0.0 -props.66.configurationSource = User properties +======= +props.64.key = maven.versionResolver.noCache +props.64.configurationType = Boolean +props.64.description = User property for disabling version resolver cache. +props.64.defaultValue = false +props.64.since = 3.0.0 +props.64.configurationSource = User properties +>>>>>>> 4515e4e39b (Expand value interning optimization and add configurable session property) diff --git a/src/site/markdown/configuration.yaml b/src/site/markdown/configuration.yaml index dce74ca30fd2..20935442b805 100644 --- a/src/site/markdown/configuration.yaml +++ b/src/site/markdown/configuration.yaml @@ -262,7 +262,7 @@ props: configurationSource: User properties - key: maven.session.versionFilter configurationType: String - description: "User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • \"h\" or \"h(num)\" - highest version or top list of highest ones filter
  • \"l\" or \"l(num)\" - lowest version or bottom list of lowest ones filter
  • \"s\" - contextual snapshot filter
  • \"ns\" - unconditional snapshot filter (no snapshots selected from ranges)
  • \"e(G:A:V)\" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: \"h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for \"top 5\" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance." + description: "User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • \"h\" or \"h(num)\" - highest version or top list of highest ones filter
  • \"l\" or \"l(num)\" - lowest version or bottom list of lowest ones filter
  • \"s\" - contextual snapshot filter
  • \"e(G:A:V)\" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: \"h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for \"top 5\" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance." defaultValue: since: 4.0.0 configurationSource: User properties diff --git a/src/site/markdown/maven-configuration.md b/src/site/markdown/maven-configuration.md index 1d159d282664..a98d449cd9b3 100644 --- a/src/site/markdown/maven-configuration.md +++ b/src/site/markdown/maven-configuration.md @@ -71,7 +71,7 @@ To modify this file, edit the template and regenerate. | `maven.repo.local.tail.ignoreAvailability` | `String` | User property for chained LRM: whether to ignore "availability check" in tail or not. Usually you do want to ignore it. This property is mapped onto corresponding Resolver 2.x property, is like a synonym for it. Default value: true. | - | 3.9.0 | User properties | | `maven.resolver.dependencyManagerTransitivity` | `String` | User property for selecting dependency manager behaviour regarding transitive dependencies and dependency management entries in their POMs. Maven 3 targeted full backward compatibility with Maven2, hence it ignored dependency management entries in transitive dependency POMs. Maven 4 enables "transitivity" by default, hence unlike Maven2, obeys dependency management entries deep in dependency graph as well.
Default: "true". | `true` | 4.0.0 | User properties | | `maven.resolver.transport` | `String` | Resolver transport to use. Can be default, wagon, apache, jdk or auto. | `default` | 4.0.0 | User properties | -| `maven.session.versionFilter` | `String` | User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "ns" - unconditional snapshot filter (no snapshots selected from ranges)
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. | - | 4.0.0 | User properties | +| `maven.session.versionFilter` | `String` | User property for version filter expression used in session, applied to resolving ranges: a semicolon separated list of filters to apply. By default, no version filter is applied (like in Maven 3).
Supported filters:
  • "h" or "h(num)" - highest version or top list of highest ones filter
  • "l" or "l(num)" - lowest version or bottom list of lowest ones filter
  • "s" - contextual snapshot filter
  • "e(G:A:V)" - predicate filter (leaves out G:A:V from range, if hit, V can be range)
Example filter expression: "h(5);s;e(org.foo:bar:1) will cause: ranges are filtered for "top 5" (instead full range), snapshots are banned if root project is not a snapshot, and if range for org.foo:bar is being processed, version 1 is omitted. Value in this property builds org.eclipse.aether.collection.VersionFilter instance. | - | 4.0.0 | User properties | | `maven.settings.security` | `String` | | `${maven.user.conf}/settings-security4.xml` | | User properties | | `maven.startInstant` | `java.time.Instant` | User property used to store the build timestamp. | - | 4.0.0 | User properties | | `maven.style.color` | `String` | Maven output color mode. Allowed values are auto, always, never. | `auto` | 4.0.0 | User properties |