Author: tchemit
Date: Wed Jul 11 12:31:36 2012
New Revision: 1360148
URL: http://svn.apache.org/viewvc?rev=1360148&view=rev
Log:
[MREACTOR-21] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-reactor-plugin/pom.xml
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java
Modified: maven/plugins/trunk/maven-reactor-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/pom.xml?rev=1360148&r1=1360147&r2=1360148&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-reactor-plugin/pom.xml Wed Jul 11 12:31:36 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>
@@ -74,6 +74,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.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
<version>2.0.10</version>
@@ -101,4 +106,30 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java?rev=1360148&r1=1360147&r2=1360148&view=diff
==============================================================================
---
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
(original)
+++
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
Wed Jul 11 12:31:36 2012
@@ -19,19 +19,19 @@ package org.apache.maven.plugin.reactor;
* under the License.
*/
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.codehaus.plexus.util.dag.Vertex;
+
import java.util.List;
import java.util.Set;
-import org.codehaus.plexus.util.dag.Vertex;
-
/**
* Goal to build a project X and all of the reactor projects that depend on X
*
* @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a>
- * @goal make-dependents
- * @aggregator
- * @phase process-sources
*/
+@Mojo( name = "make-dependents", aggregator = true, defaultPhase =
LifecyclePhase.PROCESS_SOURCES )
public class MakeDependentsMojo
extends MakeMojo
{
Modified:
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java?rev=1360148&r1=1360147&r2=1360148&view=diff
==============================================================================
---
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
(original)
+++
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
Wed Jul 11 12:31:36 2012
@@ -19,101 +19,99 @@ package org.apache.maven.plugin.reactor;
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+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.project.MavenProject;
import org.apache.maven.shared.invoker.Invoker;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.Vertex;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* Goal to build a project X and all of the reactor projects on which X
depends
*
* @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a>
- * @goal make
- * @aggregator
- * @phase process-sources
*/
+@Mojo( name = "make", aggregator = true, defaultPhase =
LifecyclePhase.PROCESS_SOURCES )
public class MakeMojo
extends AbstractMojo
{
/**
* Location of the POM file; provided by Maven
- * @parameter expression="${basedir}"
- *
*/
+ @Parameter( property = "basedir" )
File baseDir;
-
+
/**
* A list of every project in this reactor; provided by Maven
- * @parameter expression="${project.collectedProjects}"
*/
+ @Parameter( property = "project.collectedProjects" )
List collectedProjects;
-
+
/**
* If you don't specify a groupId in your artifactList, we'll use this as
the default groupId.
- * @parameter expression="${make.group}" default-value="${project.groupId}"
- *
*/
+ @Parameter( property = "make.group", defaultValue = "${project.groupId}" )
String defaultGroup;
-
+
/**
- * A list of artifacts to build, e.g.
"com.mycompany:bar,com.mycompany:foo" or just "foo,bar", or just "foo"
- * @parameter expression="${make.artifacts}" default-value=""
- * @required
+ * A list of artifacts to build, e.g.
"com.mycompany:bar,com.mycompany:foo" or just "foo,bar", or just "foo"
*/
+ @Parameter( property = "make.artifacts", defaultValue = "", required =
true )
String artifactList;
-
+
/**
* A list of relative paths to build, e.g. "foo,baz/bar"
- * @parameter expression="${make.folders}" default-value=""
- * @required
*/
+ @Parameter( property = "make.folders", defaultValue = "", required = true )
String folderList;
-
+
/**
* Goals to run on subproject.
- * @parameter expression="${make.goals}" default-value="install"
*/
+ @Parameter( property = "make.goals", defaultValue = "install" )
String goals;
-
+
/**
* Provided by Maven
- * @component
*/
+ @Component
Invoker invoker;
-
+
/**
* Don't really do anything; just print a command that describes what the
command would have done
- * @parameter expression="${make.printOnly}"
*/
+ @Parameter( property = "make.printOnly" )
private boolean printOnly = false;
-
+
/**
- * @component
*/
+ @Component
SimpleInvoker simpleInvoker;
-
+
/**
* The artifact from which we'll resume, e.g. "com.mycompany:foo" or just
"foo"
- * @parameter expression="${fromArtifact}"
*/
+ @Parameter( property = "fromArtifact" )
String continueFromProject;
-
+
/**
* The project folder from which we'll resume
- * @parameter expression="${from}"
*/
+ @Parameter( property = "from" )
File continueFromFolder;
public void execute()
Modified:
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java?rev=1360148&r1=1360147&r2=1360148&view=diff
==============================================================================
---
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
(original)
+++
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
Wed Jul 11 12:31:36 2012
@@ -19,14 +19,12 @@ package org.apache.maven.plugin.reactor;
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+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.project.MavenProject;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -36,34 +34,36 @@ import org.apache.maven.scm.manager.ScmM
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* Goal to build all projects that you personally have changed (according to
SCM)
*
* @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a>
- * @goal make-scm-changes
- * @aggregator
- * @phase process-sources
*/
+@Mojo( name = "make-scm-changes", aggregator = true, defaultPhase =
LifecyclePhase.PROCESS_SOURCES )
public class MakeScmChanges
extends MakeDependentsMojo
{
/**
* The SCM connection/provider info. Should be specified in your POM.
- * @parameter expression="${make.scmConnection}"
default-value="${project.scm.connection}"
- * @required
*/
+ @Parameter( property = "make.scmConnection", defaultValue =
"${project.scm.connection}", required = true )
String scmConnection;
/**
* Ignore files in the "unknown" status (created but not added to source
control)
- *
- * @parameter expression="${make.ignoreUnknown}" default-value=true
*/
+ @Parameter( property = "make.ignoreUnknown", defaultValue = "true" )
private boolean ignoreUnknown = true;
/**
- * @component
*/
+ @Component
ScmManager scmManager;
public void execute()
Modified:
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java?rev=1360148&r1=1360147&r2=1360148&view=diff
==============================================================================
---
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java
(original)
+++
maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/ResumeMojo.java
Wed Jul 11 12:31:36 2012
@@ -26,6 +26,10 @@ import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+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.project.MavenProject;
import org.apache.maven.project.ProjectSorter;
import org.apache.maven.shared.invoker.Invoker;
@@ -34,64 +38,60 @@ import org.apache.maven.shared.invoker.I
* Goal to resume building a reactor at a certain point
*
* @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a>
- * @goal resume
- * @aggregator
- * @phase process-sources
*/
+@Mojo( name = "resume", aggregator = true, defaultPhase =
LifecyclePhase.PROCESS_SOURCES )
public class ResumeMojo
extends AbstractMojo
{
-
+
/**
- * @parameter expression="${project.collectedProjects}"
*/
+ @Parameter( property = "project.collectedProjects" )
List collectedProjects;
-
+
/**
* Location of the file.
- * @parameter expression="${basedir}"
*/
+ @Parameter( property = "basedir" )
File baseDir;
-
+
/**
- * @parameter expression="${make.group}" default-value="${project.groupId}"
*/
+ @Parameter( property = "make.group", defaultValue = "${project.groupId}" )
String continueFromGroup;
-
+
/**
* The artifact from which we'll resume, e.g. "com.mycompany:foo" or just
"foo"
- * @parameter expression="${fromArtifact}" default-value="null"
- * @required
*/
+ @Parameter( property = "fromArtifact", defaultValue = "null", required =
true )
String continueFromProject;
-
+
/**
* The project folder from which we'll resume
- * @parameter expression="${from}" default-value="null"
- * @required
*/
+ @Parameter( property = "from", defaultValue = "null", required = true )
File continueFromFolder;
-
+
/**
* Goals to run on subproject
- * @parameter expression="${make.goals}" default-value="install"
*/
+ @Parameter( property = "make.goals", defaultValue = "install" )
String goals;
-
+
/**
- * @component
*/
+ @Component
Invoker invoker;
-
+
/**
* Don't really do anything; just print a message that describes what the
command would have done
- * @parameter expression="${make.printOnly}"
*/
+ @Parameter( property = "make.printOnly" )
boolean printOnly = false;
-
+
/**
- * @component
*/
+ @Component
SimpleInvoker simpleInvoker;
public void execute()
