You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/10/09 19:05:45 UTC
svn commit: r1396113 - in
/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin: ./
src/main/java/org/apache/maven/plugins/patchtracker/
Author: olamy
Date: Tue Oct 9 17:05:45 2012
New Revision: 1396113
URL: http://svn.apache.org/viewvc?rev=1396113&view=rev
Log:
use mojo annotations
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml?rev=1396113&r1=1396112&r2=1396113&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml Tue Oct 9 17:05:45 2012
@@ -36,6 +36,7 @@ under the License.
<properties>
<mavenVersion>2.0.6</mavenVersion>
<mavenScmVersion>1.8</mavenScmVersion>
+ <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
</properties>
<dependencies>
<dependency>
@@ -96,7 +97,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0</version>
+ <version>3.0.8</version>
</dependency>
<dependency>
@@ -169,6 +170,13 @@ under the License.
<version>2.2</version>
</dependency>
+ <!-- dependencies to annotations -->
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${mavenPluginPluginVersion}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -180,6 +188,28 @@ under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${mavenPluginPluginVersion}</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>help-goal</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<version>1.3.8</version>
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java?rev=1396113&r1=1396112&r2=1396113&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/AbstractPatchMojo.java Tue Oct 9 17:05:45 2012
@@ -22,6 +22,8 @@ package org.apache.maven.plugins.patchtr
import org.apache.commons.lang.StringUtils;
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.Parameter;
import org.apache.maven.plugins.patchtracker.patching.PatchRepository;
import org.apache.maven.plugins.patchtracker.tracking.PatchTracker;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerRequest;
@@ -59,106 +61,74 @@ public abstract class AbstractPatchMojo
{
/**
* The Maven Project Object.
- *
- * @parameter default-value="${project}"
- * @required
- * @readonly
*/
+ @Component
protected MavenProject project;
- /**
- * @parameter default-value="${basedir}"
- * @required
- * @readonly
- */
+ @Parameter ( defaultValue = "basedir", required = true, readonly = true )
protected File baseDir;
- /**
- * @parameter expression="${scm.providerType}" default-value=""
- */
+ @Parameter ( defaultValue = "", property = "scm.providerType" )
protected String providerType = "";
- /**
- * @parameter default-value="${settings}"
- * @required
- * @readonly
- */
+ @Parameter ( defaultValue = "${settings", readonly = true, required = true )
protected Settings settings;
/**
* if user/password are stored in your settings.xml in a server
- *
- * @parameter expression="${patch.serverId}" default-value=""
*/
+ @Parameter ( defaultValue = "", property = "patch.serverId" )
protected String serverId;
/**
* if path tracker url is not stored in the pom.
* <b>For jira, url must include project key!: http://jira.codehaus.org/browse/MNG</b>
- *
- * @parameter expression="${patch.serverUrl}" default-value=""
*/
+ @Parameter ( defaultValue = "", property = "patch.serverUrl" )
protected String serverUrl;
- /**
- * @parameter expression="${patch.user}" default-value=""
- */
+ @Parameter ( property = "patch.user", defaultValue = "" )
protected String user;
- /**
- * @parameter expression="${patch.password}" default-value=""
- */
+ @Parameter ( property = "patch.password", defaultValue = "" )
protected String password;
- /**
- * @parameter expression="${patch.issueSystem}" default-value=""
- */
+ @Parameter ( property = "patch.issueSystem", defaultValue = "" )
protected String issueSystem;
- /**
- * @parameter expression="${patch.patchSystem}" default-value="${project.patchManagement.system}"
- */
+ @Parameter ( property = "patch.patchSystem", defaultValue = "${project.patchManagement.system}" )
protected String patchSystem;
- /**
- * @parameter expression="${patch.summary}" default-value=""
- */
+ @Parameter ( defaultValue = "", property = "patch.summary" )
protected String summary;
- /**
- * @parameter expression="${patch.description}" default-value=""
- */
+ @Parameter ( defaultValue = "", property = "patch.description" )
protected String description;
/**
* the type of the patch tracker entry to load: default 1 for jira bug
- *
- * @parameter expression="${patch.patchType}" default-value="1"
*/
+ @Parameter ( defaultValue = "1", property = "patch.patchType" )
protected String patchType;
/**
* the priority of the patch tracker entry to load: default 3 for jira major
- *
- * @parameter expression="${patch.priority}" default-value="3"
*/
+ @Parameter ( defaultValue = "3", property = "patch.priority" )
protected String patchPriority;
/**
* Component used to prompt for input.
- *
- * @component
*/
+ @Component
protected Prompter prompter;
protected PlexusContainer plexusContainer;
- /**
- * @component
- */
+ @Component
protected ScmManager scmManager;
@@ -415,7 +385,8 @@ public abstract class AbstractPatchMojo
}
else
{
- value = ( possibleValues == null || possibleValues.isEmpty() ) ? ( StringUtils.isEmpty( defaultValue )
+ value = ( possibleValues == null || possibleValues.isEmpty() )
+ ? ( StringUtils.isEmpty( defaultValue )
? prompter.prompt( message )
: prompter.prompt( message, defaultValue ) )
: ( StringUtils.isEmpty( defaultValue )
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java?rev=1396113&r1=1396112&r2=1396113&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java Tue Oct 9 17:05:45 2012
@@ -19,9 +19,10 @@ package org.apache.maven.plugins.patchtr
* under the License.
*/
-import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.patchtracker.patching.PatchRepository;
import org.apache.maven.plugins.patchtracker.patching.PatchRepositoryException;
import org.apache.maven.plugins.patchtracker.patching.PatchRepositoryRequest;
@@ -35,40 +36,35 @@ import org.codehaus.plexus.component.rep
/**
* @author Olivier Lamy
- * @goal to-issue
- * @aggregator
*/
+@Mojo ( name = "to-issue", aggregator = true )
public class PatchToIssueMojo
extends AbstractPatchMojo
{
/**
* for github user/organization : github.com/apache use apache
- *
- * @parameter expression="${patch.request.organisation}" default-value=""
*/
+ @Parameter ( property = "patch.request.organisation", defaultValue = "" )
protected String organisation;
/**
* github repo : github.com/apache/maven-3 use maven-3
- *
- * @parameter expression="${patch.request.repository}" default-value=""
*/
+ @Parameter ( property = "patch.request.repository", defaultValue = "" )
protected String repository;
/**
* for github: pull request id
- *
- * @parameter expression="${patch.request.id}" default-value=""
*/
+ @Parameter ( property = "patch.request.id", defaultValue = "" )
protected String id;
/**
* for github api url https://api.github.com
- *
- * @parameter expression="${patch.patchSystem.url}" default-value="${project.patchManagement.url}"
*/
+ @Parameter ( property = "patch.patchSystem.url", defaultValue = "${project.patchManagement.url}" )
protected String patchSystemUrl;
public void execute()
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java?rev=1396113&r1=1396112&r2=1396113&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PostPatchMojo.java Tue Oct 9 17:05:45 2012
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.patchtr
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.patchtracker.tracking.PatchTracker;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerException;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerRequest;
@@ -30,9 +31,8 @@ import org.codehaus.plexus.component.rep
* Goal which create a diff/patch file from the current project and post it in the selected patch tracker
* (with jira an issue in the project with attaching the created patch file)
*
- * @goal post
- * @aggregator
*/
+@Mojo (name = "post", aggregator = true)
public class PostPatchMojo
extends AbstractPatchMojo
{
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java?rev=1396113&r1=1396112&r2=1396113&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/UpdatePatchMojo.java Tue Oct 9 17:05:45 2012
@@ -21,6 +21,8 @@ package org.apache.maven.plugins.patchtr
import org.apache.commons.lang.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.patchtracker.tracking.PatchTracker;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerException;
import org.apache.maven.plugins.patchtracker.tracking.PatchTrackerRequest;
@@ -31,17 +33,13 @@ import org.codehaus.plexus.components.in
/**
* Goal which create a diff/patch file from the current project and create an issue in the project
* with attaching the created patch file
- *
- * @goal update
- * @aggregator
*/
+@Mojo ( name = "update", aggregator = true )
public class UpdatePatchMojo
extends AbstractPatchMojo
{
- /**
- * @parameter expression="${patch.patchId}" default-value=""
- */
+ @Parameter ( defaultValue = "", property = "patch.patchId" )
protected String patchId;