[MNG-8410] Rename maven-api-meta to maven-api-annotations

gnodet · gnodet · commit 218e37fb303a · 2024-12-08T22:58:08.000+01:00
* Move plugin api to maven-api-plugin
* Rename maven-api-meta to maven-api-annotations
diff --git a/api/maven-api-annotations/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-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/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
diff --git a/api/maven-api-annotations/src/site/site.xml b/api/maven-api-annotations/src/site/site.xml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
