You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by tc...@apache.org on 2012/07/10 17:26:32 UTC
svn commit: r1359728 - in /maven/plugins/trunk/maven-antrun-plugin: pom.xml
src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Author: tchemit
Date: Tue Jul 10 15:26:31 2012
New Revision: 1359728
URL: http://svn.apache.org/viewvc?rev=1359728&view=rev
Log:
[MANTRUN-176] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1359728&r1=1359727&r2=1359728&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue Jul 10 15:26:31 2012
@@ -71,6 +71,11 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
@@ -81,4 +86,35 @@ under the License.
<version>1.8.2</version>
</dependency>
</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>
+ </plugins>
+ </build>
+
</project>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1359728&r1=1359727&r2=1359728&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Tue Jul 10 15:26:31 2012
@@ -19,22 +19,15 @@ package org.apache.maven.plugin.antrun;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+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.project.MavenProjectHelper;
import org.apache.tools.ant.BuildException;
@@ -50,6 +43,17 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
/**
* Maven AntRun Mojo. <br/>
* This plugin provides the capability of calling Ant tasks from a POM by running the nested ant tasks inside the
@@ -59,10 +63,8 @@ import org.codehaus.plexus.util.StringUt
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
- * @goal run
- * @threadSafe
- * @requiresDependencyResolution test
*/
+@Mojo( name = "run", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST )
public class AntRunMojo
extends AbstractMojo
{
@@ -103,122 +105,113 @@ public class AntRunMojo
/**
* The Maven project object
- *
- * @parameter expression="${project}"
- * @readonly
*/
+ @Component
private MavenProject project;
/**
* The Maven project helper object
- *
- * @component
*/
+ @Component
private MavenProjectHelper projectHelper;
/**
* The plugin dependencies.
- *
- * @parameter expression="${plugin.artifacts}"
- * @required
- * @readonly
*/
+ @Parameter( property = "plugin.artifacts", required = true, readonly = true )
private List<Artifact> pluginArtifacts;
/**
* The local Maven repository
- *
- * @parameter expression="${localRepository}"
- * @readonly
*/
+ @Parameter( property = "localRepository", readonly = true )
protected ArtifactRepository localRepository;
/**
* String to prepend to project and dependency property names.
- *
- * @parameter default-value=""
+ *
* @since 1.4
*/
+ @Parameter( defaultValue = "" )
private String propertyPrefix;
/**
* The xml tag prefix to use for the built in Ant tasks. This prefix needs to be prepended to each task referenced
* in the antrun target config. For example, a prefix of "mvn" means that the attachartifact task is referenced by
* "<mvn:attachartifact>" The default value of an empty string means that no prefix is used for the tasks.
- *
- * @parameter default-value=""
+ *
* @since 1.5
*/
+ @Parameter( defaultValue = "" )
private String customTaskPrefix = "";
/**
* The name of a property containing the list of all dependency versions. This is used for the removing the versions
* from the filenames.
- *
- * @parameter default-value="maven.project.dependencies.versions"
*/
+ @Parameter( defaultValue = "maven.project.dependencies.versions" )
private String versionsPropertyName;
/**
* The XML for the Ant task. You can add anything you can add between <target> and </target> in a
* build.xml.
- *
+ *
* @deprecated Use target instead
- * @parameter
*/
+ @Parameter
private PlexusConfiguration tasks;
/**
* The XML for the Ant target. You can add anything you can add between <target> and </target> in a
* build.xml.
- *
- * @parameter
+ *
* @since 1.5
*/
+ @Parameter
private PlexusConfiguration target;
/**
* This folder is added to the list of those folders containing source to be compiled. Use this if your ant script
* generates source code.
- *
- * @parameter expression="${sourceRoot}"
+ *
* @deprecated Use the build-helper-maven-plugin to bind source directories
*/
+ @Parameter( property = "sourceRoot" )
private File sourceRoot;
/**
* This folder is added to the list of those folders containing source to be compiled for testing. Use this if your
* ant script generates test source code.
- *
- * @parameter expression="${testSourceRoot}"
+ *
* @deprecated Use the build-helper-maven-plugin to bind test source directories
*/
+ @Parameter( property = "testSourceRoot" )
private File testSourceRoot;
/**
* Specifies whether the Antrun execution should be skipped.
- *
- * @parameter expression="${maven.antrun.skip}" default-value="false"
+ *
* @since 1.7
*/
+ @Parameter( property = "maven.antrun.skip", defaultValue = "false" )
private boolean skip;
/**
* Specifies whether the Ant properties should be propagated to the Maven properties.
- *
- * @parameter default-value="false"
+ *
* @since 1.7
*/
+ @Parameter( defaultValue = "false" )
private boolean exportAntProperties;
/**
* Specifies whether a failure in the ant build leads to a failure of the Maven build. If this value is 'true', the
* Maven build will proceed even if the ant build fails. If it is 'false', then the Maven build fails if the ant
* build fails.
- *
- * @parameter default-value="true"
+ *
* @since 1.7
*/
+ @Parameter( defaultValue = "true" )
private boolean failOnError;
/**