This is an automated email from the ASF dual-hosted git repository.
gnodet 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 781d19d9f1 [MNG-8410] Rename maven-api-meta to maven-api-annotations
(#1957)
781d19d9f1 is described below
commit 781d19d9f162f03cf3b1644070fee4679f5d857a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Dec 10 22:43:27 2024 +0100
[MNG-8410] Rename maven-api-meta to maven-api-annotations (#1957)
---
api/{maven-api-meta => maven-api-annotations}/pom.xml | 2 +-
.../src/main/java/org/apache/maven/api/annotations/Config.java | 0
.../src/main/java/org/apache/maven/api/annotations/Consumer.java | 0
.../src/main/java/org/apache/maven/api/annotations/Experimental.java | 0
.../src/main/java/org/apache/maven/api/annotations/Generated.java | 0
.../src/main/java/org/apache/maven/api/annotations/Immutable.java | 0
.../src/main/java/org/apache/maven/api/annotations/Nonnull.java | 0
.../src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java | 0
.../src/main/java/org/apache/maven/api/annotations/Nullable.java | 0
.../src/main/java/org/apache/maven/api/annotations/Provider.java | 0
.../src/main/java/org/apache/maven/api/annotations/ThreadSafe.java | 0
.../src/main/java/org/apache/maven/api/annotations/package-info.java | 0
api/{maven-api-meta => maven-api-annotations}/src/site/site.xml | 0
api/maven-api-cli/pom.xml | 2 +-
api/maven-api-core/pom.xml | 2 +-
api/maven-api-metadata/pom.xml | 2 +-
api/maven-api-model/pom.xml | 2 +-
api/maven-api-plugin/pom.xml | 2 +-
api/maven-api-settings/pom.xml | 2 +-
api/maven-api-spi/pom.xml | 2 +-
api/maven-api-toolchain/pom.xml | 2 +-
api/maven-api-xml/pom.xml | 2 +-
api/pom.xml | 2 +-
compat/maven-model-builder/pom.xml | 2 +-
compat/maven-model/pom.xml | 2 +-
compat/maven-plugin-api/pom.xml | 2 +-
compat/maven-repository-metadata/pom.xml | 2 +-
compat/maven-settings/pom.xml | 2 +-
compat/maven-toolchain-model/pom.xml | 2 +-
impl/maven-core/src/main/resources/META-INF/maven/extension.xml | 2 +-
impl/maven-di/pom.xml | 2 +-
impl/maven-executor/pom.xml | 2 +-
impl/maven-impl/pom.xml | 2 +-
impl/maven-jline/pom.xml | 2 +-
its/pom.xml | 2 +-
pom.xml | 2 +-
36 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/api/maven-api-meta/pom.xml b/api/maven-api-annotations/pom.xml
similarity index 96%
rename from api/maven-api-meta/pom.xml
rename to api/maven-api-annotations/pom.xml
index 7f0f89b179..f5e9286ec2 100644
--- a/api/maven-api-meta/pom.xml
+++ b/api/maven-api-annotations/pom.xml
@@ -26,7 +26,7 @@
<version>4.0.0-rc-2-SNAPSHOT</version>
</parent>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
<name>Maven 4 API :: Meta annotations</name>
<description>Maven 4 API - Java meta annotations.</description>
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Config.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Config.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Config.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Config.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Consumer.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Consumer.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Experimental.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Experimental.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Experimental.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Experimental.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Generated.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Generated.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Generated.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Generated.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Immutable.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Immutable.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Immutable.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Immutable.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nonnull.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Nonnull.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nonnull.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Nonnull.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nullable.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Nullable.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nullable.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Nullable.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Provider.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Provider.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Provider.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/Provider.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
diff --git
a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/package-info.java
b/api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/package-info.java
similarity index 100%
rename from
api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/package-info.java
rename to
api/maven-api-annotations/src/main/java/org/apache/maven/api/annotations/package-info.java
diff --git a/api/maven-api-meta/src/site/site.xml
b/api/maven-api-annotations/src/site/site.xml
similarity index 100%
rename from api/maven-api-meta/src/site/site.xml
rename to api/maven-api-annotations/src/site/site.xml
diff --git a/api/maven-api-cli/pom.xml b/api/maven-api-cli/pom.xml
index 3672d45dab..f675215466 100644
--- a/api/maven-api-cli/pom.xml
+++ b/api/maven-api-cli/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-core/pom.xml b/api/maven-api-core/pom.xml
index 4f60c0eb89..ae950fbb48 100644
--- a/api/maven-api-core/pom.xml
+++ b/api/maven-api-core/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-metadata/pom.xml b/api/maven-api-metadata/pom.xml
index 234e35cf38..e16eaa0fe3 100644
--- a/api/maven-api-metadata/pom.xml
+++ b/api/maven-api-metadata/pom.xml
@@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
</dependencies>
diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml
index 37c67d1a56..517e76e87c 100644
--- a/api/maven-api-model/pom.xml
+++ b/api/maven-api-model/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-plugin/pom.xml b/api/maven-api-plugin/pom.xml
index 789384ee30..420203ceec 100644
--- a/api/maven-api-plugin/pom.xml
+++ b/api/maven-api-plugin/pom.xml
@@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml
index 8179ad33cc..debfd99555 100644
--- a/api/maven-api-settings/pom.xml
+++ b/api/maven-api-settings/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-spi/pom.xml b/api/maven-api-spi/pom.xml
index ef6e5b3ba1..18ef646d91 100644
--- a/api/maven-api-spi/pom.xml
+++ b/api/maven-api-spi/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-toolchain/pom.xml b/api/maven-api-toolchain/pom.xml
index 8d22b6a775..d5f7bd1f7c 100644
--- a/api/maven-api-toolchain/pom.xml
+++ b/api/maven-api-toolchain/pom.xml
@@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/api/maven-api-xml/pom.xml b/api/maven-api-xml/pom.xml
index 4e70f3e57b..41513a4567 100644
--- a/api/maven-api-xml/pom.xml
+++ b/api/maven-api-xml/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
</dependencies>
diff --git a/api/pom.xml b/api/pom.xml
index cff05ae1e3..5820308ffa 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -32,7 +32,7 @@
<description>A new immutable API for Maven 4 to better manage what plugins
and extensions can influence.</description>
<modules>
- <module>maven-api-meta</module>
+ <module>maven-api-annotations</module>
<module>maven-api-di</module>
<module>maven-api-xml</module>
<module>maven-api-model</module>
diff --git a/compat/maven-model-builder/pom.xml
b/compat/maven-model-builder/pom.xml
index 3e4e2ed802..db82a8ba62 100644
--- a/compat/maven-model-builder/pom.xml
+++ b/compat/maven-model-builder/pom.xml
@@ -53,7 +53,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/compat/maven-model/pom.xml b/compat/maven-model/pom.xml
index cd35ba5966..4f234d5d56 100644
--- a/compat/maven-model/pom.xml
+++ b/compat/maven-model/pom.xml
@@ -44,7 +44,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/compat/maven-plugin-api/pom.xml b/compat/maven-plugin-api/pom.xml
index 463438212d..dd155374d4 100644
--- a/compat/maven-plugin-api/pom.xml
+++ b/compat/maven-plugin-api/pom.xml
@@ -40,7 +40,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/compat/maven-repository-metadata/pom.xml
b/compat/maven-repository-metadata/pom.xml
index 50e5a03336..c1aedc5197 100644
--- a/compat/maven-repository-metadata/pom.xml
+++ b/compat/maven-repository-metadata/pom.xml
@@ -36,7 +36,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/compat/maven-settings/pom.xml b/compat/maven-settings/pom.xml
index 89a91e7dff..52b9ea8e2f 100644
--- a/compat/maven-settings/pom.xml
+++ b/compat/maven-settings/pom.xml
@@ -44,7 +44,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/compat/maven-toolchain-model/pom.xml
b/compat/maven-toolchain-model/pom.xml
index 7d4c2466e9..441a4135dd 100644
--- a/compat/maven-toolchain-model/pom.xml
+++ b/compat/maven-toolchain-model/pom.xml
@@ -43,7 +43,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/impl/maven-core/src/main/resources/META-INF/maven/extension.xml
b/impl/maven-core/src/main/resources/META-INF/maven/extension.xml
index 454115ecdc..60d27530fc 100644
--- a/impl/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/impl/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -144,9 +144,9 @@ under the License.
<exportedArtifacts>
<!-- maven 4 api -->
+ <exportedArtifact>org.apache.maven:maven-api-annotations</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-core</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-di</exportedArtifact>
- <exportedArtifact>org.apache.maven:maven-api-meta</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-metadata</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-model</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-plugin</exportedArtifact>
diff --git a/impl/maven-di/pom.xml b/impl/maven-di/pom.xml
index 8161f27012..17d921b6a3 100644
--- a/impl/maven-di/pom.xml
+++ b/impl/maven-di/pom.xml
@@ -38,7 +38,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
diff --git a/impl/maven-executor/pom.xml b/impl/maven-executor/pom.xml
index 1047082914..4e1060714b 100644
--- a/impl/maven-executor/pom.xml
+++ b/impl/maven-executor/pom.xml
@@ -41,7 +41,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/impl/maven-impl/pom.xml b/impl/maven-impl/pom.xml
index 533c285082..8328c9a198 100644
--- a/impl/maven-impl/pom.xml
+++ b/impl/maven-impl/pom.xml
@@ -63,7 +63,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/impl/maven-jline/pom.xml b/impl/maven-jline/pom.xml
index d60bb90417..fec3504f82 100644
--- a/impl/maven-jline/pom.xml
+++ b/impl/maven-jline/pom.xml
@@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/its/pom.xml b/its/pom.xml
index ae5cbdd8a4..30b75a67d7 100644
--- a/its/pom.xml
+++ b/its/pom.xml
@@ -131,7 +131,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
<version>${maven-version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index aff5740daa..4f623a44b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-api-meta</artifactId>
+ <artifactId>maven-api-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
