From dc9235b22c20bb9cd4e456d731b304a0eda9aa8e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 4 Jan 2025 07:35:15 -0500 Subject: [PATCH] [MNGSITE-393] Remove references to Maven 2.x --- api/maven-api-settings/src/main/mdo/settings.mdo | 6 +++--- api/maven-api-toolchain/src/main/mdo/toolchains.mdo | 8 ++------ compat/maven-compat/src/main/mdo/profiles.mdo | 4 ++-- impl/maven-core/plugin-manager.txt | 2 -- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/api/maven-api-settings/src/main/mdo/settings.mdo b/api/maven-api-settings/src/main/mdo/settings.mdo index 14ac0672b307..fb29b72aeabc 100644 --- a/api/maven-api-settings/src/main/mdo/settings.mdo +++ b/api/maven-api-settings/src/main/mdo/settings.mdo @@ -542,9 +542,9 @@ String central or *,!repo1. - * (since Maven 2.0.5), external:* (since Maven 2.0.9) and external:http:* (since Maven 3.8.0) have + *, external:* and external:http:* (since Maven 3.8.0) have a special meaning: see Mirror Settings guide. ]]> @@ -892,7 +892,7 @@ 1.0.0+ What to do when verification of an artifact checksum fails. Valid values are "fail" (default for Maven 4 and - above), "warn" (default for Maven 2 and 3) or "ignore". + above), "warn" (default for Maven 3) or "ignore". String diff --git a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo index b8e2b1bbf81d..ab519342a8d6 100644 --- a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo +++ b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo @@ -126,7 +126,7 @@ provides 1.0.0/1.0.99 - DOM + DOM Toolchain identification information, which will be matched against project requirements. <p>Actual content structure is completely open: each toolchain type will define its own format and @@ -138,7 +138,7 @@ provides 1.1.0+ - Properties + Properties String * @@ -146,10 +146,6 @@ Toolchain identification information, which will be matched against project requirements. - <p>For Maven 2.0.9 to 3.2.3, the actual content structure was completely open: each toolchain type would - define its own format and semantics. This was generally a properties format. - <p>Since Maven 3.2.4, the type for this field has been changed to Properties to match the de-facto - format. <p>Each toolchain defines its own properties names and semantics. diff --git a/compat/maven-compat/src/main/mdo/profiles.mdo b/compat/maven-compat/src/main/mdo/profiles.mdo index 2843e806e1f6..8aa8a2997919 100644 --- a/compat/maven-compat/src/main/mdo/profiles.mdo +++ b/compat/maven-compat/src/main/mdo/profiles.mdo @@ -24,7 +24,7 @@ under the License. profiles Profiles Deprecated in Maven 2 Project-local overrides to the build process based on detected or user-provided environmental parameters. + Deprecated Project-local overrides to the build process based on detected or user-provided environmental parameters. This is the model specification for ${basedir}/profiles.xml. ]]> @@ -309,7 +309,7 @@ under the License. 1.0.0 What to do when verification of an artifact checksum fails. Valid values are "fail" (default for Maven 4 and - above), "warn" (default for Maven 2 and 3) or "ignore". + above), "warn" (default for Maven 3) or "ignore". String diff --git a/impl/maven-core/plugin-manager.txt b/impl/maven-core/plugin-manager.txt index 795494ce4395..f4beba9ef400 100644 --- a/impl/maven-core/plugin-manager.txt +++ b/impl/maven-core/plugin-manager.txt @@ -103,8 +103,6 @@ h4. Working with POMs during development During the development of a plugin we would want to make it easy for a developer to create a plugin which means we would allow the direct use of a POM to state the dependencies of a given plugin and any tooling we created would be responsible for turning the dependency information in the POM into plugin metadata which described the dependencies of the plugin. -We are looking at using Mercury for the resolution and retrieval of the plugin dependencies so during development we would translate the POMs into dependency information that Mercury can understand, and in production we would have the pre-digested format that Mercury could utilize to resolve and retrieve dependencies. We need to be careful that we are using Mercury during development and production so that we don’t get in the situation where Maven 2.x is resolving differently than Mercury is. We can still leverage POMs during development but we need to make sure Mercury is doing the work. - With respect to development inside an IDE the workspace from which we would like to resolve and retrieve dependencies is a read-only local repository to Mercury which is put at the front-end of the search order of any repository that Mercury will consult for artifacts. h4. Generation of plugin metadata and packaging