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-plugin-tools.git
The following commit(s) were added to refs/heads/master by this push:
new ed4774bc [MPLUGIN-450] Require goalPrefix to be valid (#240)
ed4774bc is described below
commit ed4774bcd8b8d2d1f7ff1196cf7644054cb3ae14
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Dec 25 21:58:51 2023 +0100
[MPLUGIN-450] Require goalPrefix to be valid (#240)
---
.../annotation-with-inheritance-from-deps/pom.xml | 1 +
.../module-mojo/pom.xml | 1 +
.../src/it/annotation-with-inheritance/pom.xml | 1 +
maven-plugin-plugin/src/it/ant-basic/pom.xml | 2 +-
.../src/it/ant-simple-usage/plugin/pom.xml | 2 +-
.../src/it/ant-since-maven-plugin/pom.xml | 3 +++
maven-plugin-plugin/src/it/asm-failure/pom.xml | 3 +++
.../src/it/beanshell-simple/pom.xml | 2 +-
.../help-basic-deprecated-annotation-only/pom.xml | 3 +++
.../src/it/help-basic-jdk11/pom.xml | 3 +++
maven-plugin-plugin/src/it/help-basic/pom.xml | 3 +++
maven-plugin-plugin/src/it/help-package/pom.xml | 1 +
.../src/it/ignore-plugin-class-realm/pom.xml | 3 +++
.../src/it/ignore-plugin-class-realm/test/pom.xml | 3 +++
.../src/it/java-basic-annotations-jdk8/pom.xml | 1 +
.../it/java-basic-annotations-jdkcurrent/pom.xml | 1 +
.../src/it/java-basic-annotations/pom.xml | 1 +
maven-plugin-plugin/src/it/java-basic/pom.xml | 3 +++
maven-plugin-plugin/src/it/mplugin-223/pom.xml | 1 +
.../src/it/mplugin-272_java8/pom.xml | 1 +
.../src/it/mplugin-299_no-configuration/pom.xml | 3 +++
.../it/mplugin-305_defaultMojoDependencies/pom.xml | 1 +
.../it/mplugin-305_emptyMojoDependencies/pom.xml | 1 +
.../it/mplugin-305_singleMojoDependencies/pom.xml | 1 +
.../src/it/mplugin-324_javadoc/pom.xml | 3 +++
.../src/it/mplugin-363_help-reproducible/pom.xml | 3 +++
.../it/mplugin-370-maven-deps-scope-bad/pom.xml | 1 +
.../it/mplugin-370-maven-deps-scope-good/pom.xml | 1 +
.../pom.xml | 1 +
.../pom.xml | 3 +++
maven-plugin-plugin/src/it/mplugin-390/pom.xml | 3 +++
maven-plugin-plugin/src/it/packaging-jar/pom.xml | 1 +
maven-plugin-plugin/src/it/skip/pom.xml | 3 +++
.../src/it/source-encoding/latin-1/pom.xml | 3 +++
.../src/it/source-encoding/utf-8/pom.xml | 3 +++
maven-plugin-plugin/src/it/v4api/pom.xml | 3 +++
.../maven/plugin/plugin/AbstractGeneratorMojo.java | 27 +++++++++-------------
.../plugin/plugin/DescriptorGeneratorMojoTest.java | 5 +---
.../src/it/mplugin-191/pom.xml | 1 +
.../src/it/mplugin-319_report-since/pom.xml | 3 +++
.../src/it/mplugin-394_report-encoding/pom.xml | 3 +++
.../src/it/plugin-info-jdk-default-version/pom.xml | 1 +
.../src/it/plugin-info-jdk/pom.xml | 1 +
.../src/it/plugin-report-annotations/pom.xml | 1 +
.../it/plugin-report-requirements-history/pom.xml | 3 +++
.../it/plugin-report-with-javadoc-links/pom.xml | 1 +
.../src/it/plugin-report/pom.xml | 3 +++
47 files changed, 99 insertions(+), 23 deletions(-)
diff --git
a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
index c3d9fd3a..7361a7b2 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
@@ -91,6 +91,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml
b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml
index b6502d81..4d16c144 100644
---
a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml
+++
b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml
@@ -47,6 +47,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
index e8a0f585..08aa04af 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
@@ -87,6 +87,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/ant-basic/pom.xml
b/maven-plugin-plugin/src/it/ant-basic/pom.xml
index 1e676341..86e0a1fe 100644
--- a/maven-plugin-plugin/src/it/ant-basic/pom.xml
+++ b/maven-plugin-plugin/src/it/ant-basic/pom.xml
@@ -54,7 +54,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
- <prefix>antBasic</prefix>
+ <goalPrefix>antBasic</goalPrefix>
</configuration>
<dependencies>
<dependency>
diff --git a/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
b/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
index 1cd1a9b6..315fa01e 100644
--- a/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
+++ b/maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
@@ -54,7 +54,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
- <prefix>antSimpleUsage</prefix>
+ <goalPrefix>antSimpleUsage</goalPrefix>
</configuration>
<dependencies>
<dependency>
diff --git a/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
b/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
index 3b882f69..74669006 100644
--- a/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
+++ b/maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
@@ -42,6 +42,9 @@
<version>@project.version@</version>
</dependency>
</dependencies>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-plugin/src/it/asm-failure/pom.xml
b/maven-plugin-plugin/src/it/asm-failure/pom.xml
index 9da9f6d0..ffe0213a 100644
--- a/maven-plugin-plugin/src/it/asm-failure/pom.xml
+++ b/maven-plugin-plugin/src/it/asm-failure/pom.xml
@@ -43,6 +43,9 @@
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
b/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
index 8caf4be9..713f2ac2 100644
--- a/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
+++ b/maven-plugin-plugin/src/it/beanshell-simple/pom.xml
@@ -53,7 +53,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
- <prefix>beanshellBasic</prefix>
+ <goalPrefix>beanshellBasic</goalPrefix>
</configuration>
<dependencies>
<dependency>
diff --git
a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
index cb3004a7..5b48429c 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/pom.xml
@@ -65,6 +65,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>help-deprecated-annotation-only</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>help-goal</id>
diff --git a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
index a8f72562..d24a6c8a 100644
--- a/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic-jdk11/pom.xml
@@ -70,6 +70,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>help-jdk11</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>default-descriptor</id>
diff --git a/maven-plugin-plugin/src/it/help-basic/pom.xml
b/maven-plugin-plugin/src/it/help-basic/pom.xml
index 016730e1..b964ad6d 100644
--- a/maven-plugin-plugin/src/it/help-basic/pom.xml
+++ b/maven-plugin-plugin/src/it/help-basic/pom.xml
@@ -65,6 +65,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>help</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>default-descriptor</id>
diff --git a/maven-plugin-plugin/src/it/help-package/pom.xml
b/maven-plugin-plugin/src/it/help-package/pom.xml
index d5314d9d..193af71f 100644
--- a/maven-plugin-plugin/src/it/help-package/pom.xml
+++ b/maven-plugin-plugin/src/it/help-package/pom.xml
@@ -61,6 +61,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<helpPackageName>test.help</helpPackageName>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/pom.xml
b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/pom.xml
index 7b98666a..2175f9a8 100644
--- a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/pom.xml
+++ b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/pom.xml
@@ -55,6 +55,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/pom.xml
b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/pom.xml
index c616620d..0d64c4b0 100644
--- a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/pom.xml
+++ b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/pom.xml
@@ -54,6 +54,9 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.its.plugin</groupId>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
index eae3d7e0..2d69b01c 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/pom.xml
@@ -84,6 +84,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
index 13db79f6..60f728af 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/pom.xml
@@ -79,6 +79,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
index a00a1381..a30a4ddb 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
@@ -81,6 +81,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/java-basic/pom.xml
b/maven-plugin-plugin/src/it/java-basic/pom.xml
index 847e4a93..11a0edc2 100644
--- a/maven-plugin-plugin/src/it/java-basic/pom.xml
+++ b/maven-plugin-plugin/src/it/java-basic/pom.xml
@@ -59,6 +59,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-plugin/src/it/mplugin-223/pom.xml
b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
index 35c9bca1..3c59fbc1 100644
--- a/maven-plugin-plugin/src/it/mplugin-223/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-223/pom.xml
@@ -64,6 +64,7 @@
<extractor>java-annotations</extractor>
</extractors>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
index 236cb5df..a6b04289 100644
--- a/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-272_java8/pom.xml
@@ -68,6 +68,7 @@
<goal>descriptor</goal>
</goals>
<configuration>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<phase>process-classes</phase>
</execution>
diff --git a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
index 1d92deaa..6c3ea294 100644
--- a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/pom.xml
@@ -65,6 +65,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>default-descriptor</id>
diff --git
a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
index 13326430..60d1c48b 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/pom.xml
@@ -68,6 +68,7 @@
<extractor>java-annotations</extractor>
</extractors>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
index 2e4bed7a..a5363a2e 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/pom.xml
@@ -68,6 +68,7 @@
<extractor>java-annotations</extractor>
</extractors>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
index b6c3a5fa..dea284dc 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/pom.xml
@@ -71,6 +71,7 @@
<mojoDependencies>
<mojoDependency>org.apache.maven.surefire:maven-surefire-common</mojoDependency>
</mojoDependencies>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
index e356357f..389d7b07 100644
--- a/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml
@@ -73,6 +73,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>default-descriptor</id>
diff --git a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
index 3a154242..6759ca18 100644
--- a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/pom.xml
@@ -65,6 +65,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>help-goal</id>
diff --git
a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
index 2798708a..517fa017 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/pom.xml
@@ -73,6 +73,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
index 88b49f4a..599488a5 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/pom.xml
@@ -79,6 +79,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
index 6d739ec7..50273218 100644
---
a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
+++
b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/pom.xml
@@ -94,6 +94,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
index e40e1f03..7ec23225 100644
--- a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/pom.xml
@@ -87,6 +87,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
diff --git a/maven-plugin-plugin/src/it/mplugin-390/pom.xml
b/maven-plugin-plugin/src/it/mplugin-390/pom.xml
index 0f7aa5bd..bb0aeccb 100644
--- a/maven-plugin-plugin/src/it/mplugin-390/pom.xml
+++ b/maven-plugin-plugin/src/it/mplugin-390/pom.xml
@@ -107,6 +107,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
diff --git a/maven-plugin-plugin/src/it/packaging-jar/pom.xml
b/maven-plugin-plugin/src/it/packaging-jar/pom.xml
index 5b4b8c3f..174467dc 100644
--- a/maven-plugin-plugin/src/it/packaging-jar/pom.xml
+++ b/maven-plugin-plugin/src/it/packaging-jar/pom.xml
@@ -72,6 +72,7 @@ under the License.
<packagingTypes>
<packaging>jar</packaging>
</packagingTypes>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/maven-plugin-plugin/src/it/skip/pom.xml
b/maven-plugin-plugin/src/it/skip/pom.xml
index 4e6e897d..aae11e5e 100644
--- a/maven-plugin-plugin/src/it/skip/pom.xml
+++ b/maven-plugin-plugin/src/it/skip/pom.xml
@@ -50,6 +50,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
b/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
index 5c2ce92e..7775a2f0 100644
--- a/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
+++ b/maven-plugin-plugin/src/it/source-encoding/latin-1/pom.xml
@@ -61,6 +61,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
b/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
index a68864f6..015c2d94 100644
--- a/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
+++ b/maven-plugin-plugin/src/it/source-encoding/utf-8/pom.xml
@@ -61,6 +61,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/maven-plugin-plugin/src/it/v4api/pom.xml
b/maven-plugin-plugin/src/it/v4api/pom.xml
index a763c68b..ed3dd8a4 100644
--- a/maven-plugin-plugin/src/it/v4api/pom.xml
+++ b/maven-plugin-plugin/src/it/v4api/pom.xml
@@ -64,6 +64,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
<executions>
<execution>
<id>help-goal</id>
diff --git
a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
index 9399c22c..031aeb9f 100644
---
a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
+++
b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
@@ -81,28 +80,24 @@ public abstract class AbstractGeneratorMojo extends
AbstractMojo {
return;
}
- String defaultGoalPrefix = getDefaultGoalPrefix(project);
-
- if (goalPrefix == null) {
- goalPrefix = defaultGoalPrefix;
- } else if (!goalPrefix.equals(defaultGoalPrefix)) {
- getLog().warn(LS + LS + "Goal prefix is specified as: '" +
goalPrefix + "'. "
- + "Maven currently expects it to be '" + defaultGoalPrefix
+ "'." + LS);
+ if (goalPrefix == null || goalPrefix.isEmpty()) {
+ goalPrefix = getDefaultGoalPrefix(project);
+ }
+ if (goalPrefix == null || goalPrefix.isEmpty()) {
+ throw new MojoExecutionException("You need to specify a goalPrefix
as it can not be correctly computed");
}
generate();
}
static String getDefaultGoalPrefix(MavenProject project) {
- String defaultGoalPrefix;
- if
("maven-plugin-report-plugin".equalsIgnoreCase(project.getArtifactId())) {
- defaultGoalPrefix = "plugin-report";
- } else if ("maven-plugin".equalsIgnoreCase(project.getArtifactId())) {
- defaultGoalPrefix =
-
project.getGroupId().substring(project.getGroupId().lastIndexOf('.') + 1);
+ String artifactId = project.getArtifactId();
+ if (artifactId.endsWith("-maven-plugin")) {
+ return artifactId.substring(0, artifactId.length() -
"-maven-plugin".length());
+ } else if (artifactId.startsWith("maven-") &&
artifactId.endsWith("-plugin")) {
+ return artifactId.substring("maven-".length(), artifactId.length()
- "-plugin".length());
} else {
- defaultGoalPrefix =
PluginDescriptor.getGoalPrefixFromArtifactId(project.getArtifactId());
+ return null;
}
- return defaultGoalPrefix;
}
}
diff --git
a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
index daf24f73..4956340e 100644
---
a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
+++
b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
@@ -36,10 +36,7 @@ public class DescriptorGeneratorMojoTest {
arguments(null, "maven-plugin-plugin", "plugin"),
arguments(null, "maven-plugin-report-plugin", "plugin-report"),
arguments(null, "maven-default-plugin", "default"),
- arguments(null, "default-maven-plugin", "default"),
- arguments(null, "default-maven-plugin", "default"),
- arguments("foo.bar", "maven-plugin", "bar"),
- arguments("foo", "maven-plugin", "foo"));
+ arguments(null, "default-maven-plugin", "default"));
}
@ParameterizedTest
diff --git a/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
b/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
index 2dd1074c..0e870e7a 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-191/pom.xml
@@ -61,6 +61,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
</plugin>
<plugin>
diff --git a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
index 9fece222..d3a7eb7a 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/pom.xml
@@ -53,6 +53,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git
a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
index 2a813a35..a2edf995 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
+++ b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/pom.xml
@@ -65,6 +65,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git
a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
index 3dafd941..9789d650 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
@@ -57,6 +57,7 @@ under the License.
<extractors>
<extractor>java-javadoc</extractor><!-- this extractor does not
generate automatic JDK/Maven requirements -->
</extractors>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
</plugin>
<plugin>
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
b/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
index 83c6d716..20130c55 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk/pom.xml
@@ -61,6 +61,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipDescriptor>true</skipDescriptor>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
</plugin>
<plugin>
diff --git
a/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
b/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
index 3d740f1e..0c5087a5 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/pom.xml
@@ -90,6 +90,7 @@ under the License.
<version>@project.version@</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
<executions>
<execution>
diff --git
a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
index 0d77f338..88bba2a8 100644
---
a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
+++
b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/pom.xml
@@ -69,6 +69,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
index cabb67cf..11f88cfb 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/pom.xml
@@ -94,6 +94,7 @@ under the License.
<externalJavadocBaseUrls>
<externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl>
</externalJavadocBaseUrls>
+ <goalPrefix>prefix</goalPrefix>
</configuration>
</plugin>
<plugin>
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
index a6559802..43f0afd7 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-report-plugin/src/it/plugin-report/pom.xml
@@ -85,6 +85,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <goalPrefix>prefix</goalPrefix>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
