svn commit: r1359667 - in /maven/plugins/trunk/maven-verifier-plugin: pom.xml src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java

[tc...@apache.org]

Author: tchemit
Date: Tue Jul 10 13:42:46 2012
New Revision: 1359667

URL: http://svn.apache.org/viewvc?rev=1359667&view=rev
Log:
[MVERIFIER-13] use maven-plugin-tools' java 5 annotations

Modified:
    maven/plugins/trunk/maven-verifier-plugin/pom.xml
    maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java

Modified: maven/plugins/trunk/maven-verifier-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/pom.xml?rev=1359667&r1=1359666&r2=1359667&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-verifier-plugin/pom.xml Tue Jul 10 13:42:46 2012
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>21</version>
+    <version>22</version>
     <relativePath>../maven-plugins/pom.xml</relativePath>
   </parent>
 
@@ -60,6 +60,15 @@ under the License.
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
+
+    <!-- dependencies to annotations -->
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.1</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -74,8 +83,34 @@ under the License.
   </dependencies>
 
   <build>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>3.1</version>
+          <configuration>
+            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>mojo-descriptor</id>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <executions>

Modified: maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java?rev=1359667&r1=1359666&r2=1359667&view=diff
==============================================================================
--- maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java (original)
+++ maven/plugins/trunk/maven-verifier-plugin/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java Tue Jul 10 13:42:46 2012
@@ -23,6 +23,9 @@ import org.apache.maven.plugin.AbstractM
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.verifier.model.Verifications;
 import org.apache.maven.plugin.verifier.model.io.xpp3.VerificationsXpp3Reader;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 
@@ -37,37 +40,30 @@ import java.util.regex.Pattern;
 /**
  * Verifies the existence or non-existence of files/directories and optionally checks file content against a regular expression.
  *
- * @goal verify
- * @phase integration-test
- *
  * @author <a href="vmassol@apache.org">Vincent Massol</a>
  * @version $Id$
  */
+@Mojo( name = "verify", defaultPhase = LifecyclePhase.INTEGRATION_TEST )
 public class VerifierMojo
     extends AbstractMojo
 {
     /**
      * Project base directory (prepended to relative file paths).
-     *
-     * @parameter expression="${basedir}"
-     * @required
      */
+    @Parameter( property = "basedir", required = true )
     private File basedir;
 
     /**
      * The file containing the verifications to perform.
-     *
-     * @parameter default-value="${basedir}/src/test/verifier/verifications.xml" expression="${verifier.verificationFile}"
-     * @required
      */
+    @Parameter( property = "verifier.verificationFile", defaultValue = "${basedir}/src/test/verifier/verifications.xml",
+                required = true )
     private File verificationFile;
 
     /**
      * Whether the build will fail on verification errors.
-     *
-     * @parameter default-value="true" expression="${verifier.failOnError}"
-     * @required
      */
+    @Parameter( property = "verifier.failOnError", defaultValue = "true", required = true )
     private boolean failOnError;
 
     private VerificationResultPrinter resultPrinter = new ConsoleVerificationResultPrinter( getLog() );
@@ -95,7 +91,7 @@ public class VerifierMojo
         File result = file;
         if ( !file.isAbsolute() )
         {
-            result = new File(  basedir , file.getPath() );
+            result = new File( basedir, file.getPath() );
         }
         return result;
     }