From 40d808edb316fd4cfc92f49b440e32677222fcdd Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 21 Oct 2022 15:32:44 +0200
Subject: [PATCH] Move the modello velocity plugin out of the API

...  so that it won't be shown in the API documentation
---
 api/pom.xml                                                    | 1 -
 .../pom.xml                                                    | 2 +-
 .../main/java/org/codehaus/modello/plugin/velocity/Helper.java | 0
 .../codehaus/modello/plugin/velocity/ModelloVelocityMojo.java  | 0
 .../codehaus/modello/plugin/velocity/VelocityGenerator.java    | 0
 .../src/main/resources/META-INF/plexus/components.xml          | 0
 pom.xml                                                        | 3 ++-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename {api/modello-plugin-velocity => modello-plugin-velocity}/pom.xml (98%)
 rename {api/modello-plugin-velocity => modello-plugin-velocity}/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java (100%)
 rename {api/modello-plugin-velocity => modello-plugin-velocity}/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java (100%)
 rename {api/modello-plugin-velocity => modello-plugin-velocity}/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java (100%)
 rename {api/modello-plugin-velocity => modello-plugin-velocity}/src/main/resources/META-INF/plexus/components.xml (100%)

diff --git a/api/pom.xml b/api/pom.xml
index bb197162f471..96fdadb65e20 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -31,7 +31,6 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>modello-plugin-velocity</module>
     <module>maven-api-meta</module>
     <module>maven-api-xml</module>
     <module>maven-api-model</module>
diff --git a/api/modello-plugin-velocity/pom.xml b/modello-plugin-velocity/pom.xml
similarity index 98%
rename from api/modello-plugin-velocity/pom.xml
rename to modello-plugin-velocity/pom.xml
index b27baeccacba..1e4171427a34 100644
--- a/api/modello-plugin-velocity/pom.xml
+++ b/modello-plugin-velocity/pom.xml
@@ -22,7 +22,7 @@
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven-api</artifactId>
+    <artifactId>maven</artifactId>
     <version>4.0.0-alpha-3-SNAPSHOT</version>
   </parent>
 
diff --git a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java b/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java
similarity index 100%
rename from api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java
rename to modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java
diff --git a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java b/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java
similarity index 100%
rename from api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java
rename to modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java
diff --git a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java b/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
similarity index 100%
rename from api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
rename to modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
diff --git a/api/modello-plugin-velocity/src/main/resources/META-INF/plexus/components.xml b/modello-plugin-velocity/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from api/modello-plugin-velocity/src/main/resources/META-INF/plexus/components.xml
rename to modello-plugin-velocity/src/main/resources/META-INF/plexus/components.xml
diff --git a/pom.xml b/pom.xml
index 2ccd6b9c6551..4b4801724e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,12 +78,13 @@ under the License.
 
   <modules>
     <module>maven-bom</module>
+    <module>modello-plugin-velocity</module>
+    <module>api</module>
     <module>maven-plugin-api</module>
     <module>maven-builder-support</module>
     <module>maven-model</module>
     <module>maven-model-builder</module>
     <module>maven-model-transform</module>
-    <module>api</module>
     <module>maven-xml-impl</module>
     <module>plexus-utils</module>
     <module>maven-core</module>