From 6e6ee108b7e4c4d5219c403c6b326c5c01a7483a Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Sat, 3 Nov 2012 16:42:01 +0000 Subject: [PATCH] [MPLUGIN-231] Switch to plugin annotations for the generated help-mojo if the Maven Plugin depends on maven-plugin-annotations git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1405379 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/plugin/plugin/HelpGeneratorMojo.java | 7 ++++--- .../src/main/resources/help-class-source.vm | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java index e31274c..25ea26d 100644 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java @@ -19,17 +19,18 @@ package org.apache.maven.plugin.plugin; * under the License. */ +import java.io.File; + import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.tools.plugin.generator.Generator; import org.apache.maven.tools.plugin.generator.PluginHelpGenerator; import org.codehaus.plexus.velocity.VelocityComponent; -import java.io.File; - /** * Generates a HelpMojo class. * @@ -37,7 +38,7 @@ import java.io.File; * @version $Id$ * @since 2.4 */ -@Mojo( name = "helpmojo", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true /*, requiresDependencyResolution = ResolutionScope.COMPILE */ ) +@Mojo( name = "helpmojo", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE ) public class HelpGeneratorMojo extends AbstractGeneratorMojo { diff --git a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm index 407f9a7..18da3a2 100644 --- a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm +++ b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm @@ -4,6 +4,11 @@ package ${helpPackageName}; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; +#if ( $useAnnotations ) +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +#end + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -24,10 +29,15 @@ import java.util.List; * Call mvn ${goalPrefix}:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. * @author * @version +#if ( !$useAnnotations ) * @goal help * @requiresProject false * @threadSafe +#end */ +#if ( $useAnnotations ) +@Mojo( name = "help", requiresProject = false, threadSafe = true ) +#end public class HelpMojo extends AbstractMojo {