Skip to content

Commit 84ee422

Browse files
authored
[MNG-7870] Undeprecate G level metadata (#1224)
The modello generated classes should not be deprecated, and they are in use. --- https://issues.apache.org/jira/browse/MNG-7870
1 parent 94b9244 commit 84ee422

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

maven-repository-metadata/src/main/mdo/metadata.mdo

+2-8
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ under the License.
7474
<field xdoc.separator="blank">
7575
<name>plugins</name>
7676
<version>1.0.0+</version>
77-
<description>The set of plugins when this directory represents a "groupId" (deprecated)</description>
78-
<annotations>
79-
<annotation>@Deprecated</annotation>
80-
</annotations>
77+
<description>The set of plugins when this directory represents a "groupId".</description>
8178
<association>
8279
<type>Plugin</type>
8380
<multiplicity>*</multiplicity>
@@ -383,10 +380,7 @@ under the License.
383380
<class java.clone="deep">
384381
<name>Plugin</name>
385382
<version>1.0.0+</version>
386-
<description>Mapping information for a single plugin within this group (deprecated).</description>
387-
<annotations>
388-
<annotation>@Deprecated</annotation>
389-
</annotations>
383+
<description>Mapping information for a single plugin within this group.</description>
390384
<comment>NOTE: plugin version is _NOT_ included here, since it is resolved using a separate algorithm in plugins' artifact.</comment>
391385
<fields>
392386
<field>

maven-repository-metadata/src/site/apt/index.apt

+4-8
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Maven Repository Metadata Model
4444
gives data about available versions (<<<latest>>>, <<<release>>>, <<<versions>>> list and <<<lastUpdated>>>),
4545

4646
[[3]] in a "groupId/artifactId/version" snapshot artifact directory: metadata describes <<<groupId>>>, <<<artifactId>>>, <<<version>>> (base version, i.e. ending in <<<-SNAPSHOT>>>) and
47-
<<<versioning>>> element that gives data about snaphot (<<<snapshot>>>, <<<lastUpdated>>> and <<<snapshotVersions>>> list). Notice that a
47+
<<<versioning>>> element that gives data about snapshot (<<<snapshot>>>, <<<lastUpdated>>> and <<<snapshotVersions>>> list). Notice that a
4848
release artifact directory is not expected to provide metadata.
4949

5050
[]
@@ -55,10 +55,6 @@ Maven Repository Metadata Model
5555

5656
* a {{{./repository-metadata.html}Descriptor Reference}}.
5757

58-
Notice: data about plugins in a directory representing a groupId is deprecated and will be removed in a future Maven version.
59-
~~ logic behind this:
60-
~~ 1. MNG-7266: maven-compat will be removed from future Maven version
61-
~~ 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
62-
~~ 3. this will lead to inconsistent data: removing it will be safer/more clear
63-
~~ but this logic still remains to be confirmed by clear consensus of the whole team
64-
58+
59+
For more information see this page: {{{https://maven.apache.org/repositories/metadata.html}Maven Metadata}}.
60+

0 commit comments

Comments
 (0)