From 0f741814bb1b91b0ad3765443e348c42cbccecbf Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 5 Jun 2025 09:24:52 -0400 Subject: [PATCH 1/2] [MNGSITE-393] remove references to Maven 2 --- maven-model/src/main/mdo/maven.mdo | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 181cf35d75f2..af1c943d572a 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -55,7 +55,7 @@

An XSD is available at:

]]> @@ -679,10 +679,10 @@ defaultGoal 3.0.0+ - The default goal (or phase in Maven 2) to execute when none is specified for - the project. Note that in case of a multi-module build, only the default goal of the top-level - project is relevant, i.e. the default goals of child modules are ignored. Since Maven 3, - multiple goals/phases can be separated by whitespace. + The default goal to execute when none is specified for + the project. In a multi-module build, only the default goal of the top-level + project is relevant. That is, the default goals of child modules are ignored. + Multiple goals/phases can be separated by whitespace. String @@ -1087,10 +1087,8 @@ 3.0.0+ 3.2.1. The actual version will be resolved based on the usage context. - Version requirement can also be specified as a range of versions, e.g. [3.2.0,). This is discouraged as it may break predictability of resolved version. - See dependency version requirement documentation - and transitive dependencies resolution for more details. + The version of the dependency such as 3.2.1. This can also be + specified as a range of versions. ]]> String @@ -1401,10 +1399,10 @@ none (default), - converted (repository manager converted this from an Maven 1 POM), + tools placing it in the repository. Valid values are: none (default), + converted (repository manager converted this from a Maven 1 POM), partner - (directly synced from a partner Maven 2 repository), deployed (was deployed from a Maven 2 + (directly synced from a partner Maven repository), deployed (was deployed from a Maven instance), verified (has been hand verified as correct and final). ]]> @@ -3142,11 +3140,7 @@ 2.0 maven-plugin), the minimum version of - Maven required to use the resulting plugin.
- In Maven 2, this was also specifying the minimum version of Maven required to build a - project, but this usage is deprecated in Maven 3 and not checked any more: use - the Maven Enforcer Plugin's - requireMavenVersion rule instead. + Maven required to use the resulting plugin. ]]> false From 7da10aac4845a68bd473e7e58a558831d74a8766 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 6 Jun 2025 11:14:32 -0400 Subject: [PATCH 2/2] restore --- maven-model/src/main/mdo/maven.mdo | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index af1c943d572a..8fb879c0ca63 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -682,7 +682,7 @@ The default goal to execute when none is specified for the project. In a multi-module build, only the default goal of the top-level project is relevant. That is, the default goals of child modules are ignored. - Multiple goals/phases can be separated by whitespace. + Multiple goals can be separated by whitespace. String @@ -1087,8 +1087,13 @@ 3.0.0+ 3.2.1. This can also be - specified as a range of versions. + The version requirement of the dependency such as 3.2.1. + The actual version will be resolved by dependency mediation. + The version requirement can also be + specified as a range of versions such as [3.2.0,). + However, this is discouraged since it may break predictability of + the resolved version. See the Dependency Version Requirement Specification + and Transitive Dependencies for more details. ]]> String @@ -2570,8 +2575,8 @@ Warning: This is an internal utility property that is only public for technical reasons, - it is not part of the public API. In particular, this property can be changed or deleted without prior + Warning: This is an internal utility property that is only public for technical reasons. + It is not part of the public API. In particular, this property can be changed or deleted without prior notice. ]]>