From f84d8338ab52d7c4bc3634d0607e83571c483994 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 14 Oct 2022 22:19:24 +0200
Subject: [PATCH] Fix modello-plugin-velocity which breaks the release plugin

---
 api/maven-api-model/pom.xml         |  1 -
 api/maven-api-settings/pom.xml      |  1 -
 api/maven-api-toolchain/pom.xml     |  1 -
 api/modello-plugin-velocity/pom.xml | 11 +++--------
 maven-model/pom.xml                 |  1 -
 maven-plugin-api/pom.xml            |  1 -
 maven-settings/pom.xml              |  1 -
 maven-toolchain-model/pom.xml       |  1 -
 pom.xml                             |  5 +++++
 9 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml
index a62c6c72b2..1054373161 100644
--- a/api/maven-api-model/pom.xml
+++ b/api/maven-api-model/pom.xml
@@ -67,7 +67,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven</groupId>
         <artifactId>modello-plugin-velocity</artifactId>
-        <version>4.0.0-alpha-1-SNAPSHOT</version>
         <configuration>
           <version>5.0.0</version>
           <models>
diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml
index e6b3c9c0eb..906ee1e5ea 100644
--- a/api/maven-api-settings/pom.xml
+++ b/api/maven-api-settings/pom.xml
@@ -67,7 +67,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven</groupId>
         <artifactId>modello-plugin-velocity</artifactId>
-        <version>4.0.0-alpha-1-SNAPSHOT</version>
         <configuration>
           <version>2.0.0</version>
           <models>
diff --git a/api/maven-api-toolchain/pom.xml b/api/maven-api-toolchain/pom.xml
index cba137cf61..0890db96b2 100644
--- a/api/maven-api-toolchain/pom.xml
+++ b/api/maven-api-toolchain/pom.xml
@@ -68,7 +68,6 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>modello-plugin-velocity</artifactId>
-                <version>4.0.0-alpha-1-SNAPSHOT</version>
                 <configuration>
                     <version>1.1.0</version>
                     <models>
diff --git a/api/modello-plugin-velocity/pom.xml b/api/modello-plugin-velocity/pom.xml
index 2875135e73..5a0e0f8b74 100644
--- a/api/modello-plugin-velocity/pom.xml
+++ b/api/modello-plugin-velocity/pom.xml
@@ -33,22 +33,17 @@
     Modello Velocity Plugin generates custom templates.
   </description>
 
-  <properties>
-    <mavenPluginTools>3.6.4</mavenPluginTools>
-    <maven>3.8.5</maven>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${mavenPluginTools}</version>
+      <version>3.6.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven}</version>
+      <version>3.8.6</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -60,7 +55,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven}</version>
+      <version>3.8.6</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 01b6796875..3413829a02 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -77,7 +77,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven</groupId>
         <artifactId>modello-plugin-velocity</artifactId>
-        <version>4.0.0-alpha-1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>velocity</id>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 5b812942cb..0174ee5465 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -90,7 +90,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven</groupId>
         <artifactId>modello-plugin-velocity</artifactId>
-        <version>4.0.0-alpha-1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>velocity</id>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 2410260b55..aa9a74ba28 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -81,7 +81,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven</groupId>
         <artifactId>modello-plugin-velocity</artifactId>
-        <version>4.0.0-alpha-1-SNAPSHOT</version>
         <executions>
           <execution>
             <id>velocity</id>
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
index a0a8b0bdfc..07a264b27e 100644
--- a/maven-toolchain-model/pom.xml
+++ b/maven-toolchain-model/pom.xml
@@ -82,7 +82,6 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>modello-plugin-velocity</artifactId>
-                <version>4.0.0-alpha-1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>velocity</id>
diff --git a/pom.xml b/pom.xml
index a7a5c65afa..d7eb75683e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,6 +499,11 @@ under the License.
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>modello-plugin-velocity</artifactId>
+          <version>${project.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>