Merge branch 'release/0.9.9'

Author: schrepfler

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>jira-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>Maven Jira Plugin</name>
-    <version>0.9.8</version>
+    <version>0.9.9</version>
     <description>This maven plugin contains MOJOs to ease integration with Jira</description>
     <url>https://github.com/schrepfler/jira-maven-plugin</url>
 

src/main/java/net/sigmalab/maven/plugin/jira/CreateNewVersionMojo.java

@@ -1,6 +1,9 @@
 package net.sigmalab.maven.plugin.jira;
 
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 import com.atlassian.jira.rest.client.api.JiraRestClient;
 import com.atlassian.jira.rest.client.api.ProjectRestClient;
@@ -10,41 +13,38 @@
 import com.atlassian.jira.rest.client.api.domain.input.VersionInput;
 
 /**
- * Goal that creates a version in a JIRA project . NOTE: REST API access must be
+ * Goal that creates a version in a JIRA project. NOTE: REST API access must be
  * enabled in your JIRA installation. Check JIRA docs for more info.
  * 
- * @goal create-new-jira-version
- * @phase deploy
- * 
  * @author George Gastaldi
  * @author Srdan Srepfler
  * @author dgrierso
  */
+@Mojo(name = "create-new-jira-version", defaultPhase = LifecyclePhase.DEPLOY)
 public class CreateNewVersionMojo extends AbstractJiraMojo {
 
     /**
      * Next Development Version
-     * 
-     * @parameter default-value="${project.version}"
-     * @required
      */
+    @Parameter(defaultValue = "${project.version}", required = true)
     private String developmentVersion;
 
     /**
-     * @parameter default-value="${project.build.finalName}"
+     * Final name of the build artifact
      */
+    @Parameter(defaultValue = "${project.build.finalName}")
     private String finalName;
 
     /**
      * Whether the final name is to be used for the version; defaults to false.
-     * 
-     * @parameter
      */
+    @Parameter
     private boolean finalNameUsedForVersion;
 
     /**
-     * @parameter default-value="${project.name}"
+     * Description for the version
      */
+    @Parameter(defaultValue = "${project.name}")
     private String versionDescription;
 
     /**

src/main/java/net/sigmalab/maven/plugin/jira/GenerateReleaseNotesMojo.java

@@ -11,6 +11,9 @@
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 import com.atlassian.jira.rest.client.api.JiraRestClient;
 import com.atlassian.jira.rest.client.api.domain.Issue;
@@ -21,68 +24,57 @@
 /**
  * Goal that generates release notes based on a version in a JIRA project.
  * 
- * @goal generate-release-notes
- * @phase deploy
- * 
  * @author George Gastaldi
  * @author dgrierso
  */
+@Mojo(name = "generate-release-notes", defaultPhase = LifecyclePhase.DEPLOY)
 public class GenerateReleaseNotesMojo extends AbstractJiraMojo {
 
     /**
      * JQL Template to find issues associated with this version.
      * 
      * Parameter 0 = Project Key
      * Parameter 1 = Fix version
-     * 
-     * @parameter default-value="project = ''{0}'' AND fixVersion = ''{1}''"
-     * @required
      */
+    @Parameter(defaultValue = "project = ''{0}'' AND fixVersion = ''{1}''", required = true)
     String jqlTemplate;
 
     /**
      * Max number of issues to return
-     * 
-     * @parameter default-value="500"
-     * @required
      */
+    @Parameter(defaultValue = "500", required = true)
     int maxIssues = 500;  // Default matches @parameter annotation
 
     /**
      * Released Version
-     * 
-     * @parameter default-value="${project.version}"
      */
+    @Parameter(defaultValue = "${project.version}")
     String releaseVersion;
 
     /**
      * Target file
-     * 
-     * @parameter default-value="${project.build.directory}/releaseNotes.txt"
      */
+    @Parameter(defaultValue = "${project.build.directory}/releaseNotes.txt")
     File targetFile;
 
     /**
      * Text to be appended BEFORE all issues details.
-     * 
-     * @parameter
      */
+    @Parameter
     String beforeText;
 
     /**
      * Text to be appended AFTER all issues details.
-     * 
-     * @parameter
      */
+    @Parameter
     String afterText;
 
     /**
      * Format of the generated release note.
      * 
      * Options are: PlainTextGenerator | MarkDownGenerator | HtmlGenerator
-     * 
-     * @parameter default-value="PlainTextGenerator"
      */
+    @Parameter(defaultValue = "PlainTextGenerator")
     String format;
 
     /**

src/main/java/net/sigmalab/maven/plugin/jira/ReleaseVersionMojo.java

@@ -1,36 +1,35 @@
 package net.sigmalab.maven.plugin.jira;
 
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.joda.time.DateTime;
 
 import com.atlassian.jira.rest.client.api.JiraRestClient;
 import com.atlassian.jira.rest.client.api.domain.Version;
 import com.atlassian.jira.rest.client.api.domain.input.VersionInputBuilder;
 
 /**
- * Goal that creates a version in a JIRA project . NOTE: API access must be
+ * Goal that releases a version in a JIRA project. NOTE: API access must be
  * enabled in your JIRA installation. Check JIRA docs for more info.
  * 
- * @goal release-jira-version
- * @phase deploy
- * 
  * @author George Gastaldi
  * @author dgrierso
  */
+@Mojo(name = "release-jira-version", defaultPhase = LifecyclePhase.DEPLOY)
 public class ReleaseVersionMojo extends AbstractJiraMojo {
 
     /**
      * Released Version
-     * 
-     * @parameter default-value="${project.version}"
      */
+    @Parameter(defaultValue = "${project.version}")
     private String releaseVersion;
 
     /**
      * Auto Discover latest release and release it.
-     * 
-     * @parameter default-value="false"
      */
+    @Parameter(defaultValue = "false")
     private boolean autoDiscoverLatestRelease;
 
     /**