You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by an...@apache.org on 2012/11/29 14:54:54 UTC

svn commit: r1415161 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm maven-plugin-tools-annotations/src/site/apt/index.apt

Author: andham
Date: Thu Nov 29 13:54:53 2012
New Revision: 1415161

URL: http://svn.apache.org/viewvc?rev=1415161&view=rev
Log:
[MPLUGIN-236] Value for Mojo's 'defaultPhase' parameter is incorrectly a string in examples

Modified:
    maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
    maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm?rev=1415161&r1=1415160&r2=1415161&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm Thu Nov 29 13:54:53 2012
@@ -122,5 +122,5 @@ Using Plugin Tools Java5 Annotations
 *-------------------------------+---------------+
 | <<<@goal "goal-name">>>       | <<<@Mojo( name = "goal-name" )>>>
 *-------------------------------+---------------+
-| <<<@phase "\<phase-name\>">>> | <<<@Mojo( defaultPhase = "\<phase-name\>" )>>>
+| <<<@phase "\<phase-name\>">>> | <<<@Mojo( defaultPhase = LifecyclePhase.\<phase\> )>>>
 *-------------------------------+---------------+

Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt?rev=1415161&r1=1415160&r2=1415161&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/site/apt/index.apt Thu Nov 29 13:54:53 2012
@@ -39,13 +39,13 @@ import org.apache.maven.execution.MavenS
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Execute;
 import org.apache.maven.plugins.annotations.InstantiationStrategy;
 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.project.MavenProject;
 import org.apache.maven.settings.Settings;
 
@@ -60,7 +60,7 @@ import org.apache.maven.settings.Setting
        executionStrategy = "<once-per-session|always>",
        inheritByDefault = <true|false>,
        instantiationStrategy = InstantiationStrategy.<strategy>,
-       defaultPhase = "<phase-name>",
+       defaultPhase = LifecyclePhase.<phase>,
        requiresDependencyResolution = ResolutionScope.<scope>,
        requiresDependencyCollection = ResolutionScope.<scope>, // (since Maven 3.0)
        requiresDirectInvocation = <false|true>,
@@ -69,7 +69,7 @@ import org.apache.maven.settings.Setting
        requiresReports = <false|true>, // (unsupported since Maven 3.0)
        threadSafe = <false|true> ) // (since Maven 3.0)
 @Execute( goal = "<goal-name>",
-          phase = LifecyclePhase.<phase>
+          phase = LifecyclePhase.<phase>,
           lifecycle = "<lifecycle-id>" )
 public class MyMojo
     extends AbstractMojo