svn commit: r1337808 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src: it/annotation-with-inheritance-from-deps/ it/annotation-with-inheritance-reactor/module-mojo/ it/annotation-with-inheritance/ it/java-basic-annotations/ main/java/org/apache/m...

[hb...@apache.org]

Author: hboutemy
Date: Sun May 13 08:29:05 2012
New Revision: 1337808

URL: http://svn.apache.org/viewvc?rev=1337808&view=rev
Log:
[MPLUGIN-189] changed descriptor goal default phase from generate-resources to process-classes for Java 5 annotations (which are actually taken from compiled code, not from source)

Modified:
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
    maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml?rev=1337808&r1=1337807&r2=1337808&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml Sun May 13 08:29:05 2012
@@ -107,7 +107,6 @@ under the License.
         <executions>
           <execution>
             <id>mojo-descriptor</id>
-            <phase>process-classes</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml?rev=1337808&r1=1337807&r2=1337808&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/pom.xml Sun May 13 08:29:05 2012
@@ -47,7 +47,6 @@ under the License.
         <executions>
           <execution>
             <id>mojo-descriptor</id>
-            <phase>process-classes</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml?rev=1337808&r1=1337807&r2=1337808&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml Sun May 13 08:29:05 2012
@@ -101,7 +101,6 @@ under the License.
         <executions>
           <execution>
             <id>mojo-descriptor</id>
-            <phase>process-classes</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml?rev=1337808&r1=1337807&r2=1337808&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic-annotations/pom.xml Sun May 13 08:29:05 2012
@@ -78,7 +78,6 @@ under the License.
         <executions>
           <execution>
             <id>mojo-descriptor</id>
-            <phase>process-classes</phase>
             <goals>
               <goal>descriptor</goal>
             </goals>

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java?rev=1337808&r1=1337807&r2=1337808&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java Sun May 13 08:29:05 2012
@@ -28,13 +28,14 @@ import java.io.File;
 /**
  * Generate a plugin descriptor.
  * <br/>
- * <b>Note:</b> Phase is after the "compilation" of any scripts.
+ * <b>Note:</b> Since 3.0, <a href="http://maven.apache.org/ref/current/maven-core/lifecycles.html">phase</a>
+ * is after the "compilation" of any scripts.
  *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
  * @since 2.0
  * @goal descriptor
- * @phase generate-resources
+ * @phase process-classes
  * @requiresDependencyResolution runtime
  */
 public class DescriptorGeneratorMojo