You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2023/09/07 10:05:39 UTC
[maven] branch master updated: [MNG-7870] Undeprecate G level metadata (#1224)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 1c050eee7b [MNG-7870] Undeprecate G level metadata (#1224)
1c050eee7b is described below
commit 1c050eee7bc21b5b6ea3d774ace255eba85e20e2
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Sep 7 12:05:21 2023 +0200
[MNG-7870] Undeprecate G level metadata (#1224)
The modello generated classes should not be deprecated, and they are in use.
Forward port of 84ee422e65e86fc866c94dec162311b46a27f187
---
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, 4 insertions(+), 14 deletions(-)
diff --git a/maven-repository-metadata/src/main/mdo/metadata.mdo b/maven-repository-metadata/src/main/mdo/metadata.mdo
index 32fa412556..e9c39f8fa8 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.
<field xdoc.separator="blank">
<name>plugins</name>
<version>1.0.0+</version>
- <description>The set of plugins when this directory represents a "groupId" (deprecated)</description>
- <annotations>
- <annotation>@Deprecated</annotation>
- </annotations>
+ <description>The set of plugins when this directory represents a "groupId".</description>
<association>
<type>Plugin</type>
<multiplicity>*</multiplicity>
@@ -383,10 +380,7 @@ under the License.
<class java.clone="deep">
<name>Plugin</name>
<version>1.0.0+</version>
- <description>Mapping information for a single plugin within this group (deprecated).</description>
- <annotations>
- <annotation>@Deprecated</annotation>
- </annotations>
+ <description>Mapping information for a single plugin within this group.</description>
<comment>NOTE: plugin version is _NOT_ included here, since it is resolved using a separate algorithm in plugins' artifact.</comment>
<fields>
<field>
diff --git a/maven-repository-metadata/src/site/apt/index.apt b/maven-repository-metadata/src/site/apt/index.apt
index 75f067ad66..56fc874de4 100644
--- a/maven-repository-metadata/src/site/apt/index.apt
+++ b/maven-repository-metadata/src/site/apt/index.apt
@@ -55,9 +55,5 @@ Maven Repository Metadata Model
* 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
+ For more information see this page: {{{https://maven.apache.org/repositories/metadata.html}Maven Metadata}}.
+