From dd260fbc6d657d84b59b0ea5245fa00205f417d9 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 5 Sep 2023 16:55:43 +0200 Subject: [PATCH 1/3] [MNG-7870] Undeprecate G level metadata --- https://issues.apache.org/jira/browse/MNG-7870 --- maven-repository-metadata/src/main/mdo/metadata.mdo | 10 ++-------- maven-repository-metadata/src/site/apt/index.apt | 8 -------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/maven-repository-metadata/src/main/mdo/metadata.mdo b/maven-repository-metadata/src/main/mdo/metadata.mdo index 6ce381d4a830..aa7db3a2bc97 100644 --- a/maven-repository-metadata/src/main/mdo/metadata.mdo +++ b/maven-repository-metadata/src/main/mdo/metadata.mdo @@ -74,10 +74,7 @@ under the License. plugins 1.0.0+ - The set of plugins when this directory represents a "groupId" (deprecated) - - @Deprecated - + The set of plugins when this directory represents a "groupId". Plugin * @@ -383,10 +380,7 @@ under the License. Plugin 1.0.0+ - Mapping information for a single plugin within this group (deprecated). - - @Deprecated - + Mapping information for a single plugin within this group. NOTE: plugin version is _NOT_ included here, since it is resolved using a separate algorithm in plugins' artifact. diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt index 1a484f9f5c5e..074e9773b4ac 100644 --- a/maven-repository-metadata/src/site/apt/index.apt +++ b/maven-repository-metadata/src/site/apt/index.apt @@ -54,11 +54,3 @@ Maven Repository Metadata Model * {{{./apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3 XML parser, to read and write <<>> files, * a {{{./repository-metadata.html}Descriptor Reference}}. - - Notice: data about plugins in a directory representing a groupId is deprecated and will be removed in a future Maven version. -~~ logic behind this: -~~ 1. MNG-7266: maven-compat will be removed from future Maven version -~~ 2. this will remove the code that updates plugins data: see MNG-7375/MPLUGIN-384 https://maven.apache.org/ref/3.8.4/maven-compat/apidocs/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.html -~~ 3. this will lead to inconsistent data: removing it will be safer/more clear -~~ but this logic still remains to be confirmed by clear consensus of the whole team - \ No newline at end of file From d9f59a8bfd57d62e2993e5dc35eadfdf0f923a6c Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 6 Sep 2023 10:18:10 +0200 Subject: [PATCH 2/3] Remove the fluff even more This module really generates JUST the object that are used to describe G, GA and GAV level maven metadata. How the file is named, how is locally cached one named is totally irrelevant (as it is defined by layout and resolver cache logic). --- .../src/site/apt/index.apt | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt index 074e9773b4ac..ff45e6ab7067 100644 --- a/maven-repository-metadata/src/site/apt/index.apt +++ b/maven-repository-metadata/src/site/apt/index.apt @@ -27,28 +27,6 @@ Maven Repository Metadata Model This is strictly the model for Maven Repository Metadata, so really just plain objects. - The metadata file name is: - - * <<>> in a remote repository, - - * <<.xml>>> in a local repository, for metadata from a repository with <<>> identifier. - - [] - - Depending on what the directory represents ("groupId", "groupId/artifactId" or "groupId/artifactId/version"), - the Maven Repository Metadata file contains 3 different sets of metadata: - - [[1]] in a "groupId" directory: a "groupId" directory may contain Maven plugins artifacts, which are described in metadata's <<>> element, - - [[2]] in a "groupId/artifactId" directory: metadata describes <<>>, <<>> and <<>> element that - gives data about available versions (<<>>, <<>>, <<>> list and <<>>), - - [[3]] in a "groupId/artifactId/version" snapshot artifact directory: metadata describes <<>>, <<>>, <<>> (base version, i.e. ending in <<<-SNAPSHOT>>>) and - <<>> element that gives data about snaphot (<<>>, <<>> and <<>> list). Notice that a - release artifact directory is not expected to provide metadata. - - [] - The following are generated from this model: * {{{./apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3 XML parser, to read and write <<>> files, From a9843a271ae5f9da4b715264ae94f09f36aae333 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 6 Sep 2023 13:14:42 +0200 Subject: [PATCH 3/3] Restore page as is, remove deprecation message,link it to other page. --- .../src/site/apt/index.apt | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt index ff45e6ab7067..0598e3887cdb 100644 --- a/maven-repository-metadata/src/site/apt/index.apt +++ b/maven-repository-metadata/src/site/apt/index.apt @@ -27,8 +27,34 @@ Maven Repository Metadata Model This is strictly the model for Maven Repository Metadata, so really just plain objects. + The metadata file name is: + + * <<>> in a remote repository, + + * <<.xml>>> in a local repository, for metadata from a repository with <<>> identifier. + + [] + + Depending on what the directory represents ("groupId", "groupId/artifactId" or "groupId/artifactId/version"), + the Maven Repository Metadata file contains 3 different sets of metadata: + + [[1]] in a "groupId" directory: a "groupId" directory may contain Maven plugins artifacts, which are described in metadata's <<>> element, + + [[2]] in a "groupId/artifactId" directory: metadata describes <<>>, <<>> and <<>> element that + gives data about available versions (<<>>, <<>>, <<>> list and <<>>), + + [[3]] in a "groupId/artifactId/version" snapshot artifact directory: metadata describes <<>>, <<>>, <<>> (base version, i.e. ending in <<<-SNAPSHOT>>>) and + <<>> element that gives data about snapshot (<<>>, <<>> and <<>> list). Notice that a + release artifact directory is not expected to provide metadata. + + [] + The following are generated from this model: * {{{./apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3 XML parser, to read and write <<>> files, * a {{{./repository-metadata.html}Descriptor Reference}}. + + + For more information see this page: {{{https://maven.apache.org/repositories/metadata.html}Maven Metadata}}. +