diff --git a/api/maven-api-model/src/main/mdo/maven.mdo b/api/maven-api-model/src/main/mdo/maven.mdo index 74aff7785e54..a98fb86cc103 100644 --- a/api/maven-api-model/src/main/mdo/maven.mdo +++ b/api/maven-api-model/src/main/mdo/maven.mdo @@ -45,7 +45,7 @@ --> maven Maven diff --git a/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml index 754912f099ca..81fc7632fc10 100644 --- a/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml +++ b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml @@ -20,9 +20,9 @@ under the License. --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 diff --git a/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.2.0.xml b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.2.0.xml index 9b1b358f80d5..c387aec47245 100644 --- a/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.2.0.xml +++ b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.2.0.xml @@ -20,9 +20,9 @@ under the License. --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.2.0.xsd"> 4.2.0 diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategy.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategy.java index f0a5559d52a6..d5f4a5104514 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategy.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategy.java @@ -28,6 +28,7 @@ import eu.maveniverse.domtrip.Editor; import eu.maveniverse.domtrip.Element; import eu.maveniverse.domtrip.maven.MavenPomElements; +import eu.maveniverse.domtrip.maven.MavenPomElements.Namespaces; import org.apache.maven.api.Lifecycle; import org.apache.maven.api.cli.mvnup.UpgradeOptions; import org.apache.maven.api.di.Named; @@ -49,13 +50,11 @@ import static eu.maveniverse.domtrip.maven.MavenPomElements.Elements.SUBPROJECTS; import static eu.maveniverse.domtrip.maven.MavenPomElements.ModelVersions.MODEL_VERSION_4_0_0; import static eu.maveniverse.domtrip.maven.MavenPomElements.ModelVersions.MODEL_VERSION_4_1_0; -import static eu.maveniverse.domtrip.maven.MavenPomElements.Namespaces.MAVEN_4_0_0_NAMESPACE; -import static eu.maveniverse.domtrip.maven.MavenPomElements.Namespaces.MAVEN_4_1_0_NAMESPACE; import static org.apache.maven.cling.invoker.mvnup.goals.ModelVersionUtils.getSchemaLocationForModelVersion; /** * Strategy for upgrading Maven model versions (e.g., 4.0.0 → 4.1.0). - * Handles namespace updates, schema location changes, and element conversions. + * Handles schema location changes and element conversions. */ @Named @Singleton @@ -181,7 +180,7 @@ private void upgradeNamespaceAndSchemaLocation(Editor editor, UpgradeContext con } // Update namespace based on target model version - String targetNamespace = getNamespaceForModelVersion(targetModelVersion); + String targetNamespace = Namespaces.MAVEN_4_0_0_NAMESPACE; // Use element's attribute method to set the namespace declaration // This modifies the element in place and marks it as modified @@ -264,19 +263,6 @@ private String determineTargetModelVersion(UpgradeContext context) { } } - /** - * Gets the namespace URI for a model version. - */ - private String getNamespaceForModelVersion(String modelVersion) { - if (MavenPomElements.ModelVersions.MODEL_VERSION_4_2_0.equals(modelVersion)) { - return MavenPomElements.Namespaces.MAVEN_4_2_0_NAMESPACE; - } else if (MODEL_VERSION_4_1_0.equals(modelVersion)) { - return MAVEN_4_1_0_NAMESPACE; - } else { - return MAVEN_4_0_0_NAMESPACE; - } - } - /** * Upgrades deprecated Maven 3 phase names to Maven 4 equivalents. * This replaces pre-/post- phases with before:/after: phases. 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 783cb1d62110..90b6885fd872 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 @@ -26,12 +26,6 @@ import static eu.maveniverse.domtrip.maven.MavenPomElements.ModelVersions.MODEL_VERSION_4_0_0; import static eu.maveniverse.domtrip.maven.MavenPomElements.ModelVersions.MODEL_VERSION_4_1_0; import static eu.maveniverse.domtrip.maven.MavenPomElements.ModelVersions.MODEL_VERSION_4_2_0; -import static eu.maveniverse.domtrip.maven.MavenPomElements.Namespaces.MAVEN_4_0_0_NAMESPACE; -import static eu.maveniverse.domtrip.maven.MavenPomElements.Namespaces.MAVEN_4_1_0_NAMESPACE; -import static eu.maveniverse.domtrip.maven.MavenPomElements.Namespaces.MAVEN_4_2_0_NAMESPACE; -import static eu.maveniverse.domtrip.maven.MavenPomElements.SchemaLocations.MAVEN_4_0_0_SCHEMA_LOCATION; -import static eu.maveniverse.domtrip.maven.MavenPomElements.SchemaLocations.MAVEN_4_1_0_SCHEMA_LOCATION; -import static eu.maveniverse.domtrip.maven.MavenPomElements.SchemaLocations.MAVEN_4_2_0_SCHEMA_LOCATION; /** * Utility class for handling Maven model version operations during upgrades. @@ -47,7 +41,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 (domtrip Document) * @return the detected model version @@ -68,16 +62,6 @@ public static String detectModelVersion(Document pomDocument) { } } - // Fallback to namespace URI detection - String namespaceUri = root.namespaceDeclaration(null); - if (MAVEN_4_2_0_NAMESPACE.equals(namespaceUri)) { - return MODEL_VERSION_4_2_0; - } else 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; } @@ -239,20 +223,20 @@ public static boolean removeModelVersion(Document document) { } /** - * Gets the schema location for a model version. + * Gets the xsi:schemaLocation attribute value for a model version. * * @param modelVersion the model version * @return the schema location */ public static String getSchemaLocationForModelVersion(String modelVersion) { if (MODEL_VERSION_4_2_0.equals(modelVersion)) { - return MAVEN_4_2_0_SCHEMA_LOCATION; + return "http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.2.0.xsd"; } else if (MODEL_VERSION_4_1_0.equals(modelVersion)) { - return MAVEN_4_1_0_SCHEMA_LOCATION; + return "http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"; } else if (isNewerThan410(modelVersion)) { // For versions newer than 4.1.0 but not specifically 4.2.0, use 4.2.0 schema - return MAVEN_4_2_0_SCHEMA_LOCATION; + return "http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.2.0.xsd"; } - return MAVEN_4_0_0_SCHEMA_LOCATION; + return "http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; } } 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 new file mode 100644 index 000000000000..c2dc87910a35 --- /dev/null +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java @@ -0,0 +1,234 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.cling.invoker.mvnup.goals; + +/** + * Constants used throughout the Maven upgrade tools. + * Organized into logical groups for better maintainability. + */ +public final class UpgradeConstants { + + private UpgradeConstants() { + // Utility class + } + + /** + * Maven model version constants. + */ + public static final class ModelVersions { + /** Maven 4.0.0 model version */ + public static final String MODEL_VERSION_4_0_0 = "4.0.0"; + + /** Maven 4.1.0 model version */ + public static final String MODEL_VERSION_4_1_0 = "4.1.0"; + + private ModelVersions() { + // Utility class + } + } + + /** + * Common XML element names used in Maven POMs. + */ + public static final class XmlElements { + // Core POM elements + public static final String MODEL_VERSION = "modelVersion"; + public static final String GROUP_ID = "groupId"; + public static final String ARTIFACT_ID = "artifactId"; + public static final String VERSION = "version"; + public static final String PARENT = "parent"; + public static final String RELATIVE_PATH = "relativePath"; + public static final String PACKAGING = "packaging"; + public static final String NAME = "name"; + public static final String DESCRIPTION = "description"; + public static final String URL = "url"; + + // Build elements + public static final String BUILD = "build"; + public static final String PLUGINS = "plugins"; + public static final String PLUGIN = "plugin"; + public static final String PLUGIN_MANAGEMENT = "pluginManagement"; + public static final String DEFAULT_GOAL = "defaultGoal"; + public static final String DIRECTORY = "directory"; + public static final String FINAL_NAME = "finalName"; + public static final String SOURCE_DIRECTORY = "sourceDirectory"; + public static final String SCRIPT_SOURCE_DIRECTORY = "scriptSourceDirectory"; + public static final String TEST_SOURCE_DIRECTORY = "testSourceDirectory"; + public static final String OUTPUT_DIRECTORY = "outputDirectory"; + public static final String TEST_OUTPUT_DIRECTORY = "testOutputDirectory"; + public static final String EXTENSIONS = "extensions"; + public static final String EXECUTIONS = "executions"; + public static final String GOALS = "goals"; + public static final String INHERITED = "inherited"; + public static final String CONFIGURATION = "configuration"; + + // Module elements + public static final String MODULES = "modules"; + public static final String MODULE = "module"; + public static final String SUBPROJECTS = "subprojects"; + public static final String SUBPROJECT = "subproject"; + + // Dependency elements + public static final String DEPENDENCIES = "dependencies"; + public static final String DEPENDENCY = "dependency"; + public static final String DEPENDENCY_MANAGEMENT = "dependencyManagement"; + public static final String CLASSIFIER = "classifier"; + public static final String TYPE = "type"; + public static final String SCOPE = "scope"; + public static final String SYSTEM_PATH = "systemPath"; + public static final String OPTIONAL = "optional"; + public static final String EXCLUSIONS = "exclusions"; + + // Profile elements + public static final String PROFILES = "profiles"; + public static final String PROFILE = "profile"; + + // Project information elements + public static final String PROPERTIES = "properties"; + public static final String INCEPTION_YEAR = "inceptionYear"; + public static final String ORGANIZATION = "organization"; + public static final String LICENSES = "licenses"; + public static final String DEVELOPERS = "developers"; + public static final String CONTRIBUTORS = "contributors"; + public static final String MAILING_LISTS = "mailingLists"; + public static final String PREREQUISITES = "prerequisites"; + public static final String SCM = "scm"; + public static final String ISSUE_MANAGEMENT = "issueManagement"; + public static final String CI_MANAGEMENT = "ciManagement"; + public static final String DISTRIBUTION_MANAGEMENT = "distributionManagement"; + public static final String REPOSITORIES = "repositories"; + public static final String PLUGIN_REPOSITORIES = "pluginRepositories"; + public static final String REPOSITORY = "repository"; + public static final String PLUGIN_REPOSITORY = "pluginRepository"; + public static final String REPORTING = "reporting"; + + private XmlElements() { + // Utility class + } + } + + /** + * Common indentation patterns for XML formatting. + */ + public static final class Indentation { + public static final String TWO_SPACES = " "; + public static final String FOUR_SPACES = " "; + public static final String TAB = "\t"; + public static final String DEFAULT = TWO_SPACES; + + private Indentation() { + // Utility class + } + } + + /** + * Common Maven plugin constants. + */ + public static final class Plugins { + /** Default Maven plugin groupId */ + public static final String DEFAULT_MAVEN_PLUGIN_GROUP_ID = "org.apache.maven.plugins"; + + /** Maven plugin artifact prefix */ + public static final String MAVEN_PLUGIN_PREFIX = "maven-"; + + /** Standard reason for Maven 4 compatibility upgrades */ + public static final String MAVEN_4_COMPATIBILITY_REASON = "Maven 4 compatibility"; + + private Plugins() { + // Utility class + } + } + + /** + * Common file and directory names. + */ + public static final class Files { + /** Standard Maven POM file name */ + public static final String POM_XML = "pom.xml"; + + /** Maven configuration directory (alternative name) */ + public static final String MVN_DIRECTORY = ".mvn"; + + /** Default parent POM relative path */ + public static final String DEFAULT_PARENT_RELATIVE_PATH = "../pom.xml"; + + private Files() { + // Utility class + } + } + + /** + * Maven namespace constants. + */ + public static final class Namespaces { + /** Maven namespace URI */ + public static final String MAVEN_4_0_0_NAMESPACE = "http://maven.apache.org/POM/4.0.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 + } + } + + /** + * Schema location constants. + */ + public static final class SchemaLocations { + /** Schema location for 4.0.0 models */ + public static final String MAVEN_4_0_0_SCHEMA_LOCATION = + Namespaces.MAVEN_4_0_0_NAMESPACE + " https://maven.apache.org/xsd/maven-4.0.0.xsd"; + + /** Schema location for 4.1.0 models */ + public static final String MAVEN_4_1_0_SCHEMA_LOCATION = + Namespaces.MAVEN_4_1_0_NAMESPACE + " https://maven.apache.org/xsd/maven-4.1.0.xsd"; + + private SchemaLocations() { + // Utility class + } + } + + /** + * XML attribute constants. + */ + public static final class XmlAttributes { + /** Schema location attribute name */ + public static final String SCHEMA_LOCATION = "schemaLocation"; + + /** XSI namespace prefix */ + public static final String XSI_NAMESPACE_PREFIX = "xsi"; + + /** XSI namespace URI */ + public static final String XSI_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"; + + // Combine attributes + public static final String COMBINE_CHILDREN = "combine.children"; + public static final String COMBINE_SELF = "combine.self"; + + // Combine attribute values + public static final String COMBINE_OVERRIDE = "override"; + public static final String COMBINE_MERGE = "merge"; + public static final String COMBINE_APPEND = "append"; + + private XmlAttributes() { + // 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 2fefd68b626e..7e06f2805b88 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 @@ -128,7 +128,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") @@ -137,7 +137,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") @@ -145,7 +145,8 @@ void shouldRemoveDependencyVersionForProjectArtifact() throws Exception { String moduleBPomXml = """ - + + 4.1.0 com.example parent-project @@ -198,7 +199,7 @@ void shouldRemoveDependencyVersionForProjectArtifact() throws Exception { void shouldKeepDependencyVersionForExternalArtifact() throws Exception { String modulePomXml = """ - + com.example my-module 1.0.0 @@ -234,7 +235,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") @@ -242,7 +243,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") @@ -280,7 +281,8 @@ void shouldKeepDependencyVersionWhenVersionMismatch() throws Exception { void shouldHandlePluginDependencies() throws Exception { String moduleAPomXml = """ - + + 4.1.0 com.example module-a 1.0.0 @@ -289,7 +291,8 @@ void shouldHandlePluginDependencies() throws Exception { String moduleBPomXml = """ - + + 4.1.0 com.example module-b 1.0.0 @@ -345,7 +348,7 @@ class ParentInferenceTests { void shouldRemoveParentGroupIdWhenChildDoesntHaveExplicitGroupId() throws Exception { String parentPomXml = """ - + 4.1.0 com.example parent-project @@ -355,7 +358,7 @@ void shouldRemoveParentGroupIdWhenChildDoesntHaveExplicitGroupId() throws Except String childPomXml = """ - + 4.1.0 com.example @@ -401,7 +404,7 @@ void shouldRemoveParentGroupIdWhenChildDoesntHaveExplicitGroupId() throws Except void shouldKeepParentGroupIdWhenChildHasExplicitGroupId() throws Exception { String parentPomXml = """ - + 4.1.0 com.example parent-project @@ -411,7 +414,7 @@ void shouldKeepParentGroupIdWhenChildHasExplicitGroupId() throws Exception { String childPomXml = """ - + 4.1.0 com.example @@ -452,7 +455,7 @@ void shouldKeepParentGroupIdWhenChildHasExplicitGroupId() throws Exception { void shouldNotTrimParentElementsWhenParentIsExternal() throws Exception { String childPomXml = """ - + 4.1.0 org.springframework.boot @@ -493,7 +496,7 @@ void shouldTrimParentElementsWhenParentIsInReactor() throws Exception { // Create parent POM String parentPomXml = """ - + 4.1.0 com.example parent-project @@ -505,7 +508,7 @@ void shouldTrimParentElementsWhenParentIsInReactor() throws Exception { // Create child POM that references the parent 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 72eb68ebad5d..f2fc734f3443 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 @@ -123,7 +123,6 @@ void shouldHandleVariousModelVersionUpgradeScenarios( String initialNamespace, String initialModelVersion, String targetModelVersion, - String expectedNamespace, String expectedModelVersion, int expectedModifiedCount, String description) { @@ -148,11 +147,10 @@ void shouldHandleVariousModelVersionUpgradeScenarios( assertTrue(result.success(), "Model upgrade should succeed: " + description); assertEquals(expectedModifiedCount, result.modifiedCount(), description); - // Verify the model version and namespace - use the updated document from pomMap + // Verify the model version Document updatedDocument = pomMap.get(Paths.get("pom.xml")); Editor editor = new Editor(updatedDocument); Element root = editor.root(); - assertEquals(expectedNamespace, root.namespaceURI(), "Namespace should be updated: " + description); Element modelVersionElement = DomUtils.findChildElement(root, "modelVersion"); if (expectedModelVersion != null) { @@ -170,15 +168,13 @@ 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", "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", "4.1.0", 0, "Should not modify when already at target version"), @@ -186,7 +182,6 @@ private static Stream provideUpgradeScenarios() { "http://maven.apache.org/POM/4.0.0", null, "4.1.0", - "http://maven.apache.org/POM/4.1.0", "4.1.0", 1, "Should add model version when missing")); @@ -194,8 +189,8 @@ private static Stream provideUpgradeScenarios() { } @Nested - @DisplayName("Namespace Updates") - class NamespaceUpdateTests { + @DisplayName("Model Version Updates") + class ModelVersionUpdateTests { @Test @DisplayName("should update namespace recursively") @@ -218,7 +213,7 @@ void shouldUpdateNamespaceRecursively() throws Exception { Map pomMap = new HashMap<>(); pomMap.put(Paths.get("pom.xml"), document); - // Create context with --model-version=4.1.0 option to trigger namespace update + // Create context with --model-version=4.1.0 option UpgradeOptions options = mock(UpgradeOptions.class); when(options.modelVersion()).thenReturn(Optional.of("4.1.0")); when(options.all()).thenReturn(Optional.empty()); @@ -229,11 +224,11 @@ void shouldUpdateNamespaceRecursively() throws Exception { assertTrue(result.success(), "Model upgrade should succeed"); assertTrue(result.modifiedCount() > 0, "Should have upgraded namespace"); - // Verify namespace was updated recursively - use the updated document from pomMap + // Verify namespace was not changed - use the updated document from pomMap Document updatedDocument = pomMap.get(Paths.get("pom.xml")); Editor editor = new Editor(updatedDocument); Element root = editor.root(); - String expectedNamespaceUri = "http://maven.apache.org/POM/4.1.0"; + String expectedNamespaceUri = "http://maven.apache.org/POM/4.0.0"; assertEquals(expectedNamespaceUri, root.namespaceURI()); // Verify child elements namespace updated recursively @@ -793,7 +788,7 @@ class DowngradeHandlingTests { 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 cd5e1f0d145e..2564f666ea97 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 @@ -63,23 +63,6 @@ void shouldDetectModelVersionFromDocument() { assertEquals("4.0.0", result); } - @ParameterizedTest(name = "for {0}") - @ValueSource(strings = {"4.0.0", "4.1.0", "4.2.0"}) - @DisplayName("should detect model version") - void shouldDetectModelVersionFromNamespace(String targetVersion) throws Exception { - String pomXml = PomBuilder.create() - .namespace("http://maven.apache.org/POM/" + targetVersion) - .modelVersion(targetVersion) - .groupId("test") - .artifactId("test") - .version("1.0.0") - .build(); - - Document document = Document.of(pomXml); - String result = ModelVersionUtils.detectModelVersion(document); - assertEquals(targetVersion, result); - } - @Test @DisplayName("should return default version when model version is missing") void shouldReturnDefaultVersionWhenModelVersionMissing() throws Exception { @@ -96,23 +79,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 = Document.of(pomXml); - String result = ModelVersionUtils.detectModelVersion(document); - assertEquals("4.1.0", result); - } } @Nested @@ -415,7 +381,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 ea75e835ba0a..72debee56d65 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/main/java/org/apache/maven/internal/transformation/impl/TransformerSupport.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformerSupport.java index 3c4149120d77..44595f52d407 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformerSupport.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformerSupport.java @@ -64,8 +64,6 @@ public void transform(MavenProject project, RepositorySystemSession session, Mod throw new IllegalStateException("This transformer does not use this call."); } - protected static final String NAMESPACE_FORMAT = "http://maven.apache.org/POM/%s"; - protected static final String SCHEMA_LOCATION_FORMAT = "https://maven.apache.org/xsd/maven-%s.xsd"; protected Model read(Path src) throws IOException, XMLStreamException { @@ -79,7 +77,7 @@ protected void write(Model model, Path dest) throws IOException, XMLStreamExcept Files.createDirectories(dest.getParent()); try (Writer w = Files.newBufferedWriter(dest)) { MavenStaxWriter writer = new MavenStaxWriter(); - writer.setNamespace(String.format(NAMESPACE_FORMAT, version)); + writer.setNamespace("http://maven.apache.org/POM/4.0.0"); writer.setSchemaLocation(String.format(SCHEMA_LOCATION_FORMAT, version)); writer.setAddLocationInformation(false); writer.write(w, model); diff --git a/impl/maven-core/src/test/projects/project-builder/classic-sources-with-explicit-legacy/pom.xml b/impl/maven-core/src/test/projects/project-builder/classic-sources-with-explicit-legacy/pom.xml index 0c5726393a11..f36a8a28f4e9 100644 --- a/impl/maven-core/src/test/projects/project-builder/classic-sources-with-explicit-legacy/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/classic-sources-with-explicit-legacy/pom.xml @@ -1,7 +1,7 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/duplicate-enabled-sources/pom.xml b/impl/maven-core/src/test/projects/project-builder/duplicate-enabled-sources/pom.xml index 42d48ddcdce0..fc7ccc3fe7de 100644 --- a/impl/maven-core/src/test/projects/project-builder/duplicate-enabled-sources/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/duplicate-enabled-sources/pom.xml @@ -7,9 +7,9 @@ - Same identity with enabled=false is harmless (explicitly disabled) - First enabled=true entry wins and defines the effective configuration --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/modular-java-with-explicit-source-dir/pom.xml b/impl/maven-core/src/test/projects/project-builder/modular-java-with-explicit-source-dir/pom.xml index dfab4a6b3ff2..ed63e18f4a88 100644 --- a/impl/maven-core/src/test/projects/project-builder/modular-java-with-explicit-source-dir/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/modular-java-with-explicit-source-dir/pom.xml @@ -7,9 +7,9 @@ - ERROR for (modular project, has Java for MAIN) - Modular Java sources are used, not legacy --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/modular-no-test-java-with-explicit-test-source-dir/pom.xml b/impl/maven-core/src/test/projects/project-builder/modular-no-test-java-with-explicit-test-source-dir/pom.xml index dd27dac58612..172ef984e392 100644 --- a/impl/maven-core/src/test/projects/project-builder/modular-no-test-java-with-explicit-test-source-dir/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/modular-no-test-java-with-explicit-test-source-dir/pom.xml @@ -7,9 +7,9 @@ - ERROR for (modular project, no AC9 fallback) - No test Java sources (legacy rejected, none in ) --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/modular-resources-only-with-physical-legacy/pom.xml b/impl/maven-core/src/test/projects/project-builder/modular-resources-only-with-physical-legacy/pom.xml index 92f8cb52a4ea..aaa854f6d710 100644 --- a/impl/maven-core/src/test/projects/project-builder/modular-resources-only-with-physical-legacy/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/modular-resources-only-with-physical-legacy/pom.xml @@ -11,9 +11,9 @@ Note: The src/main/java and src/test/java directories are created empty to trigger the physical presence check. --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/modular-sources-with-explicit-resources/pom.xml b/impl/maven-core/src/test/projects/project-builder/modular-sources-with-explicit-resources/pom.xml index d2bd1a614b3f..f08091f0cffc 100644 --- a/impl/maven-core/src/test/projects/project-builder/modular-sources-with-explicit-resources/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/modular-sources-with-explicit-resources/pom.xml @@ -1,7 +1,7 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/modular-sources/pom.xml b/impl/maven-core/src/test/projects/project-builder/modular-sources/pom.xml index 2f9b1e7b0371..b01a3e1cc046 100644 --- a/impl/maven-core/src/test/projects/project-builder/modular-sources/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/modular-sources/pom.xml @@ -1,7 +1,7 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/modular-with-physical-legacy/pom.xml b/impl/maven-core/src/test/projects/project-builder/modular-with-physical-legacy/pom.xml index 27267c0bc274..1a88c6209c00 100644 --- a/impl/maven-core/src/test/projects/project-builder/modular-with-physical-legacy/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/modular-with-physical-legacy/pom.xml @@ -10,9 +10,9 @@ Note: The src/main/java and src/test/java directories are created empty to trigger the physical presence check. --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/multiple-directories-same-module/pom.xml b/impl/maven-core/src/test/projects/project-builder/multiple-directories-same-module/pom.xml index a1128eaa567b..f45fdbed42a2 100644 --- a/impl/maven-core/src/test/projects/project-builder/multiple-directories-same-module/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/multiple-directories-same-module/pom.xml @@ -8,9 +8,9 @@ - Both should have the same module attribute - The compiler will merge sources from both directories into the same output --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only-explicit-legacy/pom.xml b/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only-explicit-legacy/pom.xml index 2bb12cd7a6ab..fb08ad0e7cd2 100644 --- a/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only-explicit-legacy/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only-explicit-legacy/pom.xml @@ -10,9 +10,9 @@ - ERROR for sourceDirectory and testSourceDirectory because they differ from defaults - No Java source roots are added (legacy rejected, none in ) --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only/pom.xml b/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only/pom.xml index 12eee4001d15..5d4773b6056b 100644 --- a/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/non-modular-resources-only/pom.xml @@ -7,9 +7,9 @@ - Legacy sourceDirectory/testSourceDirectory are used as implicit fallback (AC9) - No errors since doesn't have Java for these scopes --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/projects/project-builder/sources-mixed-modules/pom.xml b/impl/maven-core/src/test/projects/project-builder/sources-mixed-modules/pom.xml index 0c658483c091..6666acd33315 100644 --- a/impl/maven-core/src/test/projects/project-builder/sources-mixed-modules/pom.xml +++ b/impl/maven-core/src/test/projects/project-builder/sources-mixed-modules/pom.xml @@ -11,9 +11,9 @@ - The compiler plugin cannot handle mixed configurations - A project must be either fully modular or fully classic --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 org.apache.maven.tests diff --git a/impl/maven-core/src/test/resources/consumer/multi-module/pom.xml b/impl/maven-core/src/test/resources/consumer/multi-module/pom.xml index 972e7c9be2b4..3b2e532ef06f 100644 --- a/impl/maven-core/src/test/resources/consumer/multi-module/pom.xml +++ b/impl/maven-core/src/test/resources/consumer/multi-module/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/consumer/simple/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/pom.xml index 73903014c17e..6c8f84060c57 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,9 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations 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 ef03c81f33dc..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 @@ -17,11 +17,12 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations 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-testutils/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml index 741f409447e7..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 9b28b8d7602a..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 org.sonatype.mavenbook.multi simple-parent @@ -31,6 +32,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/simple/simple-parent/utils-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml index 1aa6b87d45a7..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 25c05afa1d36..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 c739cc33b9d2..aef499040640 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/future-model-version-pom.xml b/impl/maven-core/src/test/resources/projects/future-model-version-pom.xml index 61f476ce8a46..c4a230596e05 100644 --- a/impl/maven-core/src/test/resources/projects/future-model-version-pom.xml +++ b/impl/maven-core/src/test/resources/projects/future-model-version-pom.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + 4.9.1 tests.project future-model-version diff --git a/impl/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml b/impl/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml index 85adac82ffa7..a39af463519d 100644 --- a/impl/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml +++ b/impl/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + 4.999.999 tests.project:future-model-version diff --git a/impl/maven-core/src/test/resources/projects/modules-empty/child/pom.xml b/impl/maven-core/src/test/resources/projects/modules-empty/child/pom.xml index 022d86535251..09ad06745e8b 100644 --- a/impl/maven-core/src/test/resources/projects/modules-empty/child/pom.xml +++ b/impl/maven-core/src/test/resources/projects/modules-empty/child/pom.xml @@ -1,4 +1,5 @@ - + + 4.1.0 modules-empty parent diff --git a/impl/maven-core/src/test/resources/projects/modules-empty/pom.xml b/impl/maven-core/src/test/resources/projects/modules-empty/pom.xml index b36128e6a522..ba7064624578 100644 --- a/impl/maven-core/src/test/resources/projects/modules-empty/pom.xml +++ b/impl/maven-core/src/test/resources/projects/modules-empty/pom.xml @@ -1,4 +1,5 @@ - + + 4.1.0 modules-empty parent 1 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..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 @@ -1,4 +1,5 @@ - + + 4.1.0 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..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/subprojects-empty/child/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-empty/child/pom.xml index 1c4f2b77091b..34b7b8be2705 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-empty/child/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-empty/child/pom.xml @@ -1,4 +1,5 @@ - + + 4.1.0 subprojects-empty parent diff --git a/impl/maven-core/src/test/resources/projects/subprojects-empty/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-empty/pom.xml index 840c572d1dad..af079070f9a2 100644 --- a/impl/maven-core/src/test/resources/projects/subprojects-empty/pom.xml +++ b/impl/maven-core/src/test/resources/projects/subprojects-empty/pom.xml @@ -1,4 +1,5 @@ - + + 4.1.0 subprojects-empty 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..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 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..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/impl/maven-core/src/test/resources/projects/tree/pom.xml b/impl/maven-core/src/test/resources/projects/tree/pom.xml index 98996f3a09d0..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/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java index e9ac14d84812..9ee63ffc9ee2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java @@ -63,7 +63,7 @@ public Model read(@Nonnull XmlReaderRequest request) throws XmlReaderException { requireNonNull(request, "request"); Model model = doRead(request); if (isModelVersionGreaterThan400(model) - && !model.getNamespaceUri().startsWith("http://maven.apache.org/POM/")) { + && !model.getNamespaceUri().equals("http://maven.apache.org/POM/4.0.0")) { throw new XmlReaderException( "Invalid namespace '" + model.getNamespaceUri() + "' for model version " + model.getModelVersion(), null, diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java index 60a49fcc2e96..1672dd961bb4 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java @@ -133,7 +133,6 @@ @Singleton public class DefaultModelBuilder implements ModelBuilder { - public static final String NAMESPACE_PREFIX = "http://maven.apache.org/POM/"; private static final String RAW = "raw"; private static final String FILE = "file"; private static final String IMPORT = "import"; @@ -1562,13 +1561,6 @@ Model doReadFileModel() throws ModelBuilderException { throw newModelBuilderException(); } - if (model.getModelVersion() == null) { - String namespace = model.getNamespaceUri(); - if (namespace != null && namespace.startsWith(NAMESPACE_PREFIX)) { - model = model.withModelVersion(namespace.substring(NAMESPACE_PREFIX.length())); - } - } - if (isBuildRequest()) { model = model.withPomFile(modelSource.getPath()); diff --git a/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml index 754912f099ca..81fc7632fc10 100644 --- a/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml +++ b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml @@ -20,9 +20,9 @@ under the License. --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.1.0.xsd"> 4.1.0 diff --git a/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.2.0.xml b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.2.0.xml index 9b1b358f80d5..c387aec47245 100644 --- a/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.2.0.xml +++ b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.2.0.xml @@ -20,9 +20,9 @@ under the License. --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.2.0.xsd"> 4.2.0 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 8a8b4b21b017..f6ccb1f3d130 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 @@ -61,7 +61,7 @@ void testValidNamespaceWithModelVersion400() throws Exception { @Test void testValidNamespaceWithModelVersion410() throws Exception { String xml = """ - + 4.1.0 """; @@ -70,7 +70,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/java/org/apache/maven/impl/model/ParentCycleDetectionTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/ParentCycleDetectionTest.java index 7fb271020539..c07b59443a35 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/ParentCycleDetectionTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/ParentCycleDetectionTest.java @@ -196,8 +196,8 @@ void testMultipleModulesWithSameParentDoNotCauseCycle(@TempDir Path tempDir) thr Path parentPom = tempDir.resolve("parent").resolve("pom.xml"); Files.createDirectories(parentPom.getParent()); Files.writeString(parentPom, """ - + 4.1.0 test parent @@ -209,8 +209,8 @@ void testMultipleModulesWithSameParentDoNotCauseCycle(@TempDir Path tempDir) thr Path moduleA = tempDir.resolve("module-a").resolve("pom.xml"); Files.createDirectories(moduleA.getParent()); Files.writeString(moduleA, """ - + 4.1.0 test @@ -225,8 +225,8 @@ void testMultipleModulesWithSameParentDoNotCauseCycle(@TempDir Path tempDir) thr Path moduleB = tempDir.resolve("module-b").resolve("pom.xml"); Files.createDirectories(moduleB.getParent()); Files.writeString(moduleB, """ - + 4.1.0 test diff --git a/impl/maven-impl/src/test/resources/poms/factory/ci-friendly-profiles.xml b/impl/maven-impl/src/test/resources/poms/factory/ci-friendly-profiles.xml index d1edb98f4e9a..627d2b5c7729 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/ci-friendly-profiles.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/ci-friendly-profiles.xml @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - 4.1.0 diff --git a/impl/maven-impl/src/test/resources/poms/factory/directory-properties-profiles.xml b/impl/maven-impl/src/test/resources/poms/factory/directory-properties-profiles.xml index ba87dbef97c0..66e16c028a1c 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/directory-properties-profiles.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/directory-properties-profiles.xml @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - 4.1.0 diff --git a/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-app.xml b/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-app.xml index 8198594af595..fa228db3819e 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-app.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-app.xml @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> - + + 4.1.0 com.example.test parent diff --git a/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-service.xml b/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-service.xml index 03db89ad3f79..4ae87917dd8f 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-service.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41-service.xml @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> - + + 4.1.0 com.example.test parent diff --git a/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41.xml b/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41.xml index 202cd53eb20f..50de36642f75 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/missing-dependency-groupId-41.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + 4.1.0 com.example.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..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 @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and 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 00ffc6d0c936..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 @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and 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 02fb63cfd0fb..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 @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 props-and-profiles-parent.xml diff --git a/impl/maven-impl/src/test/resources/poms/factory/repository-url-profiles.xml b/impl/maven-impl/src/test/resources/poms/factory/repository-url-profiles.xml index 45c81ff5fbc7..75c77802c706 100644 --- a/impl/maven-impl/src/test/resources/poms/factory/repository-url-profiles.xml +++ b/impl/maven-impl/src/test/resources/poms/factory/repository-url-profiles.xml @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - 4.1.0 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 8f5b4c355fb3..9267be31d2fe 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 @@ -72,7 +72,7 @@ void testNamespaceConsistency() throws XMLStreamException { @Test void testNamespaceInconsistencyThrows() { String xml = "\n" - + " \n" + + " \n" + " \n" + " \n" + " maven-test-plugin\n" @@ -83,7 +83,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/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java index 033aaf60bef2..6658bf5aa125 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java @@ -21,6 +21,7 @@ import java.io.File; import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,6 +34,7 @@ protected MavenITmng7228LeakyModelTest() { super(); } + @Disabled("Disabled because the maven-shade-plugin incorrectly derives namespace URIs from model versions") @Test void testLeakyModel() throws Exception { File testDir = extractResources("/mng-7228-leaky-model"); diff --git a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/pom.xml b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/pom.xml index 6722dbc9b414..686e538b6fba 100644 --- a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/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 com.gitlab.tkslaw diff --git a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/it/inject-service/pom.xml b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/it/inject-service/pom.xml index d8a2995bfcab..ad7a8754a1a2 100644 --- a/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/it/inject-service/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11055-di-service-injection/src/it/inject-service/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 com.gitlab.tkslaw diff --git a/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/a/pom.xml b/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/a/pom.xml index 11ba754ca1f1..6b6e152c79f2 100644 --- a/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/a/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/a/pom.xml @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> - + + 4.1.0 a diff --git a/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/b/pom.xml b/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/b/pom.xml index 67fdb8e0dd57..54603def3280 100644 --- a/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/b/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/b/pom.xml @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> - - + + 4.1.0 b diff --git a/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/pom.xml b/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/pom.xml index 068bf84c5f92..aecc39a56c9b 100644 --- a/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11084-reactorreader-prefer-consumer-pom/pom.xml @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> - + + 4.1.0 org.apache.maven.its.gh11084 reactor-root 1.0.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/gh-11140-repo-dm-unresolved/pom.xml b/its/core-it-suite/src/test/resources/gh-11140-repo-dm-unresolved/pom.xml index 106bb79dc367..089f2d15672c 100644 --- a/its/core-it-suite/src/test/resources/gh-11140-repo-dm-unresolved/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11140-repo-dm-unresolved/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + + 4.1.0 org.apache.maven.its.repointerp repo-dm-unresolved 1.0 diff --git a/its/core-it-suite/src/test/resources/gh-11140-repo-interpolation/pom.xml b/its/core-it-suite/src/test/resources/gh-11140-repo-interpolation/pom.xml index 5f07980e74b5..e53f70129226 100644 --- a/its/core-it-suite/src/test/resources/gh-11140-repo-interpolation/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11140-repo-interpolation/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + + 4.1.0 org.apache.maven.its.repointerp repo-interpolation 1.0 diff --git a/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/app/pom.xml b/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/app/pom.xml index a0198b5da97d..1b7efb0549ec 100644 --- a/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/app/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/app/pom.xml @@ -1,5 +1,5 @@ - + 4.1.0 diff --git a/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/pom.xml b/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/pom.xml index cc4d20ae2aad..de8e92cf1c46 100644 --- a/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11162-consumer-pom-scopes/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.gh11162 diff --git a/its/core-it-suite/src/test/resources/gh-11196-ci-friendly-profiles/pom.xml b/its/core-it-suite/src/test/resources/gh-11196-ci-friendly-profiles/pom.xml index d8573c3e3018..884d9c425065 100644 --- a/its/core-it-suite/src/test/resources/gh-11196-ci-friendly-profiles/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11196-ci-friendly-profiles/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.mng11196 diff --git a/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/deps/pom.xml b/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/deps/pom.xml index 1a2ad35b0232..c5ca23ca0708 100644 --- a/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/deps/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/deps/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 deps pom diff --git a/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/pom.xml b/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/pom.xml index 8679dad63b2e..9a59165f1bbc 100644 --- a/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11321-parent-above-root/pom.xml @@ -17,8 +17,9 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - org.apache.maven.its.gh11321 + + 4.1.0 + org.apache.maven.its.gh11321 parent-above-root 1.0-SNAPSHOT pom diff --git a/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml b/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml index 75627b32c314..3231a1c07978 100644 --- a/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11356-invalid-transitive-repository/pom.xml @@ -17,7 +17,8 @@ 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.reproducer reproducer-debezium diff --git a/its/core-it-suite/src/test/resources/gh-11384/pom.xml b/its/core-it-suite/src/test/resources/gh-11384/pom.xml index 0c23b6b95c84..a59c8907b933 100644 --- a/its/core-it-suite/src/test/resources/gh-11384/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11384/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 org.apache.maven.its.mng11384 test 1.0 diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml index 20bb8dcffd4f..6eaad6c3adf3 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/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.2.0 org.apache.maven.its.gh11456 flattened diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom index 10f66e838387..0910ad2cd243 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/flattened/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom @@ -1,5 +1,5 @@ - + 4.2.0 org.apache.maven.its.gh11456 test-mixin-flattened diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml index 693c612c72f1..dd1d86d52eae 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/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.2.0 org.apache.maven.its.gh11456 non-flattened diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/repo/org/apache/maven/its/gh11456/test-mixin/1.0/test-mixin-1.0.pom b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/repo/org/apache/maven/its/gh11456/test-mixin/1.0/test-mixin-1.0.pom index d7d04b702afd..06db4e1f2982 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/repo/org/apache/maven/its/gh11456/test-mixin/1.0/test-mixin-1.0.pom +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/non-flattened/repo/org/apache/maven/its/gh11456/test-mixin/1.0/test-mixin-1.0.pom @@ -1,5 +1,5 @@ - + 4.2.0 org.apache.maven.its.gh11456 test-mixin diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml index b4f4ef681319..a263921b36c2 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/pom.xml +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/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.2.0 org.apache.maven.its.gh11456 preserve-model-version diff --git a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom index 10f66e838387..0910ad2cd243 100644 --- a/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom +++ b/its/core-it-suite/src/test/resources/gh-11456-mixins-consumer-pom/preserve-model-version/repo/org/apache/maven/its/gh11456/test-mixin-flattened/1.0/test-mixin-flattened-1.0.pom @@ -1,5 +1,5 @@ - + 4.2.0 org.apache.maven.its.gh11456 test-mixin-flattened diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/mixin.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/mixin.xml index c02997c66d15..19f2a20730c1 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/mixin.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/mixin.xml @@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + true diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/pom.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/pom.xml index 25d6470a87a3..bf34fcafcf8f 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/mixin-4/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.2.0 org.apache.maven.its.mng5102 mixin-4 diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/project/pom.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/project/pom.xml index 74e7c60b24a3..cae7fd617798 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/classifier/project/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.2.0 org.apache.maven.its.mng5102 classifier diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/pom.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/pom.xml index 9a57fcfa592d..d42629007c24 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/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.2.0 org.apache.maven.its.mng5102 mixin-2 diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/pom.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/pom.xml index 745ddf7ae4f6..4b6bd984264a 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/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.2.0 org.apache.maven.its.mng5102 gav diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/child/pom.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/child/pom.xml index 2b435b0f150d..f579c5c26f0a 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/child/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/child/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.2.0 org.apache.maven.its.mng5102 diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.xml index d912823b5551..3c5f95cb2da8 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.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.mng5102 mixin-1 0.1 diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.xml index a65a074665b9..7b7c3e342234 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.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.mng5102 mixin-3 0.1 diff --git a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/pom.xml b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/pom.xml index f57e09554a37..822a4de20381 100644 --- a/its/core-it-suite/src/test/resources/mng-5102-mixins/path/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5102-mixins/path/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.2.0 org.apache.maven.its.mng5102 path 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..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom index f5755d9da4c0..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/expected/simple-webapp-build.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom index 279a689ab7f0..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml index a2886e367ff7..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml index 11ef77ac40d1..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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-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..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 279a689ab7f0..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/parent-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent-build.pom index e4713ea4fdbf..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 87e8ac1100e9..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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-testutils-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom index b9e9b5efe392..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/expected/simple-weather-build.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom index 7da8409ef31e..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 30e55e7df753..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 fb8c07c2d1b7..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 e4713ea4fdbf..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml index 87e8ac1100e9..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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/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..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 7da8409ef31e..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 30e55e7df753..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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 fb8c07c2d1b7..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 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the 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-7038-rootdir/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml index 6ca592c68301..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 @@ -17,7 +17,8 @@ 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.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..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 0f1b35a5028f..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 4c0d0ccfd30f..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-7360-build-consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-7360-build-consumer/pom.xml index 127b9cbd2b28..f8075c751b7f 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,8 @@ limitations under the License. --> - + + 4.1.0 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..91aefcbf9297 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,6 +1,6 @@ - - + + 4.1.0 mng7804 plugin-execution-order 1.0 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..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 248798ee3a9c..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 d145a989ecfe..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/b/pom.xml b/its/core-it-suite/src/test/resources/mng-7982-transitive-dependency-management/b/pom.xml index 80a68acb2968..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 a3fab582a1ee..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-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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..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 @@ -17,7 +17,8 @@ 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.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..90d850d8915c 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,8 @@ 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.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..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 910de385d02f..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-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..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/bad-mismatch/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml index 754d2e57a3d1..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/bad-non-resolvable/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml index 2422200ede8a..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 0917a0eb4488..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 6cc57c22abe7..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-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..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/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml index bdd71eb2f3db..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-gav/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml index 754d2e57a3d1..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/child/pom.xml b/its/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml index 4106bae8b467..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-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..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-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 db861cb8ee04..abda29ab3348 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/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-8331-versioned-and-unversioned-deps/module-b/pom.xml index 222c3894df17..31e13176792b 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 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 58ef43975eed..4ba12c648901 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-8341-deadlock/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml index 890c8dad2979..a06b12653744 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 edf01a81afbb..6a19c3b6e416 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 39750170f79a..9583c01a107c 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 bad781d90461..99872d5e66d7 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 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..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 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..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-8383-unknown-type-dependencies/pom.xml b/its/core-it-suite/src/test/resources/mng-8383-unknown-type-dependencies/pom.xml index 568ce855c788..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 0ef562eb2c6b..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 c31f9165c923..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 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..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 @@ -1,8 +1,8 @@ - - + 4.1.0 org.apache.maven.its mng-8414-preserving 1.0.0-SNAPSHOT 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..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 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..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 07de5d7f6e44..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-8525-maven-di-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml index 40e339101961..5d0c27174619 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..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 95b14b900670..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 a37c0aab5649..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 26d0cd54a268..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/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml index 5295a1978ff9..c0d5baed9501 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 compile-only-test diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml index b328285b7afc..ad72829a43a2 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 comprehensive-test diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-dep/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-dep/pom.xml index b9f24272b32d..d812f65b02e3 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-dep/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 compile-dep jar diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-only-dep/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-only-dep/pom.xml index 1950a938998f..caf287fd2a61 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-only-dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/compile-only-dep/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 compile-only-dep jar diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/pom.xml index 02977eaa8e4f..9796829fb846 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 parent pom diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-dep/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-dep/pom.xml index 4b78a06d2136..c35d6dccdd04 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-dep/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 test-dep jar diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-only-dep/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-only-dep/pom.xml index 0adecb7eff5c..cd22056e04a3 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-only-dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-only-dep/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 test-only-dep jar diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-runtime-dep/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-runtime-dep/pom.xml index 14c2ac4d2669..6ba14ba08e96 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-runtime-dep/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/deps/test-runtime-dep/pom.xml @@ -1,5 +1,6 @@ - + + 4.1.0 test-runtime-dep jar diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml index 1103663836be..53a507eaac00 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml @@ -17,7 +17,8 @@ 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.mng8750 new-scopes-parent 1.0-SNAPSHOT diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml index cbcaa259199f..1ea7580bdc26 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 test-only-test diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml index 13d458b48378..4891d8bd2a81 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 test-runtime-test diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-failure-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-failure-test/pom.xml index ab887f64362a..7de1cf46583a 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-failure-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-failure-test/pom.xml @@ -18,6 +18,7 @@ specific language governing permissions and limitations under the License. --> + 4.0.0 validation-failure-test diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-success-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-success-test/pom.xml index b98a39a72aef..4eabd7743c8b 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-success-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/validation-success-test/pom.xml @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + + 4.1.0 validation-success-test