This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git


The following commit(s) were added to refs/heads/master by this push:
     new 5eecece  Add goalPrefix for Maven plugin which name not follow 
recommendations
5eecece is described below

commit 5eececed7223920bfb0211a8e8f625c811bd9881
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Fri Dec 26 12:51:28 2025 +0100

    Add goalPrefix for Maven plugin which name not follow recommendations
    
    fix #121
---
 .../src/main/resources-filtered/archetype-resources/pom.xml        | 4 +++-
 .../resources/projects/custom-plugin-name/archetype.properties     | 4 ++++
 .../src/test/resources/projects/custom-plugin-name/goal.txt        | 1 +
 .../src/test/resources/projects/custom-plugin-name/verify.groovy   | 7 +++++++
 .../src/test/resources/projects/it-basic/verify.groovy             | 3 ++-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git 
a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
 
b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
index 7c16a67..a09a1f8 100644
--- 
a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
+++ 
b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
@@ -133,7 +133,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <configuration>
-          <!-- <goalPrefix>${artifactId}</goalPrefix> -->
+#if ( !$artifactId.endsWith('-maven-plugin') )
+          <goalPrefix>\${artifactId}</goalPrefix>
+#end
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         </configuration>
         <executions>
diff --git 
a/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/archetype.properties
 
b/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/archetype.properties
new file mode 100644
index 0000000..97c6e6b
--- /dev/null
+++ 
b/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/archetype.properties
@@ -0,0 +1,4 @@
+groupId=archetype.it
+artifactId=custom-plugin-name
+version=0.1-SNAPSHOT
+package=it.pkg.plugin
diff --git 
a/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/goal.txt
 
b/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/goal.txt
new file mode 100644
index 0000000..4df6fda
--- /dev/null
+++ 
b/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/goal.txt
@@ -0,0 +1 @@
+verify -Prun-its
diff --git 
a/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/verify.groovy
 
b/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/verify.groovy
new file mode 100644
index 0000000..97ebd42
--- /dev/null
+++ 
b/maven-archetype-plugin/src/test/resources/projects/custom-plugin-name/verify.groovy
@@ -0,0 +1,7 @@
+import groovy.xml.XmlParser
+
+File descriptorFile = new File( basedir, 
"project/custom-plugin-name/target/classes/META-INF/maven/plugin.xml" )
+assert descriptorFile.isFile()
+
+def pluginDescriptor = new XmlParser().parse( descriptorFile );
+assert pluginDescriptor.goalPrefix.text() == 'custom-plugin-name'
diff --git 
a/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy 
b/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
index cb8c32d..4ff3840 100644
--- a/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
+++ b/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
@@ -5,6 +5,8 @@ assert descriptorFile.isFile()
 
 def pluginDescriptor = new XmlParser().parse( descriptorFile );
 
+assert pluginDescriptor.goalPrefix.text() == 'basic'
+
 def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "touch" }[0]
 
 assert mojo.goal.text() == 'touch'
@@ -41,4 +43,3 @@ assert testFile.exists()
 
 testFile = new File( basedir, "project/basic-maven-plugin/src/it/settings.xml" 
);
 assert testFile.exists()
-

Reply via email to