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 f84d8338a Fix modello-plugin-velocity which breaks the release plugin
f84d8338a is described below
commit f84d8338ab52d7c4bc3634d0607e83571c483994
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Oct 14 22:19:24 2022 +0200
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 a62c6c72b..105437316 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 e6b3c9c0e..906ee1e5e 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 cba137cf6..0890db96b 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 2875135e7..5a0e0f8b7 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 01b679687..3413829a0 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 5b812942c..0174ee546 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 2410260b5..aa9a74ba2 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 a0a8b0bdf..07a264b27 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 a7a5c65af..d7eb75683 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>
