Author: tchemit Date: 2012-07-13 17:35:06 +0200 (Fri, 13 Jul 2012) New Revision: 279 Url: http://nuiton.org/repositories/revision/jredmine/279 Log: fixes #926: Use m-plugin-p 3 api Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/model/RedmineModelEnum.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/model/RedmineModelEnum.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/model/RedmineModelEnum.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/model/RedmineModelEnum.java 2012-07-13 15:35:06 UTC (rev 279) @@ -1,6 +1,6 @@ package org.nuiton.jredmine.model; -import org.nuiton.jredmine.rest.RedmineRestClient; +import org.nuiton.jredmine.v1_3_x.RedmineRequestFactoryImpl; /** * Un énumération pour connaitre l'ensemble des classes du modèle. @@ -10,17 +10,17 @@ */ public enum RedmineModelEnum { - issueStatus(IssueStatus.class, RedmineModelScope.none, RedmineRestClient.GET_ISSUE_STATUS_LIST), - issuePriority(IssuePriority.class, RedmineModelScope.none, RedmineRestClient.GET_ISSUE_PRIORITY_LIST), - project(Project.class, RedmineModelScope.none, RedmineRestClient.GET_PROJECT_LIST), - issueCategory(IssueCategory.class, RedmineModelScope.project, RedmineRestClient.GET_ISSUE_CATEGORY_LIST), - tracker(Tracker.class, RedmineModelScope.project, RedmineRestClient.GET_TRACKER_LIST), - user(User.class, RedmineModelScope.project, RedmineRestClient.GET_USER_LIST), - news(News.class, RedmineModelScope.project, RedmineRestClient.GET_NEWS_LIST), - version(Version.class, RedmineModelScope.project, RedmineRestClient.GET_VERSION_LIST), - issue(Issue.class, RedmineModelScope.version, RedmineRestClient.GET_ISSUE_LIST), - timeEntry(TimeEntry.class, RedmineModelScope.issue, RedmineRestClient.GET_ISSUE_TIME_ENTRY_LIST), - attachment(Attachment.class, RedmineModelScope.version, RedmineRestClient.GET_ATTACHMENTS_LIST); + issueStatus(IssueStatus.class, RedmineModelScope.none, RedmineRequestFactoryImpl.GET_ISSUE_STATUS_LIST), + issuePriority(IssuePriority.class, RedmineModelScope.none, RedmineRequestFactoryImpl.GET_ISSUE_PRIORITY_LIST), + project(Project.class, RedmineModelScope.none, RedmineRequestFactoryImpl.GET_PROJECT_LIST), + issueCategory(IssueCategory.class, RedmineModelScope.project, RedmineRequestFactoryImpl.GET_ISSUE_CATEGORY_LIST), + tracker(Tracker.class, RedmineModelScope.project, RedmineRequestFactoryImpl.GET_TRACKER_LIST), + user(User.class, RedmineModelScope.project, RedmineRequestFactoryImpl.GET_USER_LIST), + news(News.class, RedmineModelScope.project, RedmineRequestFactoryImpl.GET_NEWS_LIST), + version(Version.class, RedmineModelScope.project, RedmineRequestFactoryImpl.GET_VERSION_LIST), + issue(Issue.class, RedmineModelScope.version, RedmineRequestFactoryImpl.GET_ISSUE_LIST), + timeEntry(TimeEntry.class, RedmineModelScope.issue, RedmineRequestFactoryImpl.GET_ISSUE_TIME_ENTRY_LIST), + attachment(Attachment.class, RedmineModelScope.version, RedmineRequestFactoryImpl.GET_ATTACHMENTS_LIST); private final Class<?> modelType; Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -27,6 +27,8 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.model.IssueManagement; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.nuiton.jredmine.RedmineService; import org.nuiton.jredmine.RedmineServiceConfiguration; @@ -46,8 +48,6 @@ * Abstract jredmine mojo. * * @author tchemit <chemit@codelutin.com> - * @requiresOnline true - * @requiresProject true * @since 1.0.0 */ public abstract class AbstractRedmineMojo extends AbstractPlugin implements RedmineServiceConfiguration { @@ -57,11 +57,9 @@ /** * Dependance du projet. * - * @parameter default-value="${project}" - * @required - * @readonly * @since 1.0.0 */ + @Component protected MavenProject project; /** @@ -69,9 +67,9 @@ * <p/> * If no url is given, will use the issue management url. * - * @parameter expression="${redmine.url}" * @since 1.0.0 */ + @Parameter(property = "redmine.url") protected URL url; /** @@ -80,9 +78,9 @@ * <b>Note:</b> : this parameter is mandatory if you not use a {@code anonymous} service. * configuration. * - * @parameter expression="${redmine.username}" * @since 1.0.0 */ + @Parameter(property = "redmine.username") protected String username; /** @@ -91,9 +89,9 @@ * <b>Note:</b> : this parameter is mandatory if you not use a {@code anonymous} service. * configuration. * - * @parameter expression="${redmine.password}" * @since 1.0.0 */ + @Parameter(property = "redmine.password") protected String password; /** @@ -102,56 +100,54 @@ * <b>Note:</b> If nothing is filled here, we will use the system * property {@code file.encoding}. * - * @parameter expression="${redmine.encoding}" default-value="${project.build.sourceEncoding}" * @since 1.0.0 */ + @Parameter(property = "redmine.encoding", defaultValue = "${project.build.sourceEncoding}") protected String encoding; /** * Redmine project name. * - * @parameter expression="${redmine.projectId}" default-value="${project.artifactId}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.projectId", defaultValue = "${project.artifactId}", required = true) protected String projectId; /** * redmine version name. * - * @parameter expression="${redmine.versionId}" default-value="${project.version}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionId", defaultValue = "${project.version}") protected String versionId; /** * Un flag pour activer le mode verbeux. * - * @parameter expression="${redmine.verbose}" default-value="${maven.verbose}" * @since 1.0.0 */ + @Parameter(property = "redmine.verbose", defaultValue = "${maven.verbose}") protected boolean verbose; /** * Un flag pour faire échouer le build si la configuration n'est pas ok. * - * @parameter expression="${redmine.safe}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.safe", defaultValue = "true") protected boolean safe; /** - * @parameter expression="${session}" - * @readonly */ + @Component protected MavenSession session; /** * Redmine service. * - * @component * @since 1.0.0 */ + @Component protected RedmineService service; /** flag to load in init a required project using the {@link #projectId} name */ Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.jredmine.model.I18nAble; import org.nuiton.jredmine.model.IdAble; @@ -44,9 +46,9 @@ * This goals requires no authentication to the server. * * @author tchemit <chemit@codelutin.com> - * @goal display-data * @since 1.0.0 */ +@Mojo(name = "display-data", requiresOnline = true, requiresProject = true) public class DisplayDataMojo extends AbstractRedmineMojo { /** @@ -62,19 +64,17 @@ * <p/> * Note : you can specifiy several types separated by comma * - * @parameter expression="${types}" - * @required * @since 1.0.0 */ + @Parameter(property = "types", required = true) protected String types; /** * A flag to sort of not retrived data by id. * - * @parameter expression="${sortById}" default-value="true" - * @required * @since 1.0.0 */ + @Parameter(property = "sortById", defaultValue = "true", required = true) protected boolean sortById; /** @@ -85,9 +85,9 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "anonymous", defaultValue = "true") protected boolean anonymous; /** list of actions to perform */ Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; 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.changes.model.Action; import org.apache.maven.plugins.changes.model.Author; import org.apache.maven.plugins.changes.model.Body; @@ -59,9 +61,9 @@ * the annoncement mail at a release time. * * @author tchemit <chemit@codelutin.com> - * @goal generate-changes * @since 1.0.0 */ +@Mojo(name = "generate-changes", requiresOnline = true, requiresProject = true) public class GenerateChangesMojo extends AbstractRedmineMojo implements IssueCollectorConfiguration { /** The actions understood by the changes.xml format. */ @@ -81,18 +83,17 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "true") protected boolean anonymous; /** * The path of the <code>changes.xml</code> file that will be converted into an HTML report. * - * @parameter expression="${redmine.xmlPath}" default-value="${basedir}/src/changes/changes.xml" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.xmlPath", defaultValue = "${basedir}/src/changes/changes.xml", required = true) protected File xmlPath; /** @@ -100,18 +101,17 @@ * <p/> * <b>Note :</b> if not sets - will use the redmine version description (if exists). * - * @parameter expression="${releaseDescription}" * @since 1.0.0 */ + @Parameter(property = "releaseDescription") protected String releaseDescription; /** * The changes file title. * - * @parameter expression="${changesTitle}" default-value="${project.description}" - * @required * @since 1.0.0 */ + @Parameter(property = "changesTitle", defaultValue = "${project.description}", required = true) protected String changesTitle; /** @@ -119,9 +119,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersion; /** @@ -138,10 +138,9 @@ * fix:1, add:1 * </pre> * - * @parameter expression="${redmine.actionMapping}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.actionMapping", required = true) protected String actionMapping; /** @@ -150,9 +149,9 @@ * <b>Note :</b> If a value is set to empty - that means to include all status. * <p/> * - * @parameter expression="${redmine.statusIds}" * @since 1.0.0 */ + @Parameter(property = "redmine.statusIds") protected String statusIds; /** @@ -161,17 +160,17 @@ * <b>Note :</b> If a value is set to empty - that means to include all categories. * <p/> * - * @parameter expression="${redmine.categoryIds}" * @since 1.0.0 */ + @Parameter(property = "redmine.categoryIds") protected String categoryIds; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipGenerateChanges}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipGenerateChanges", defaultValue = "false") protected boolean skipGenerateChanges; /** @@ -181,9 +180,9 @@ * <p/> * The default behaviour is to generate once to reduce calls to redmine * - * @parameter expression="${redmine.generateOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.generateOnce", defaultValue = "true") protected boolean generateOnce; /** le fichier deja genere */ @@ -265,7 +264,7 @@ getLog().warn("The goal is skip due to the skipGoal flag on"); return; } - + super.init(); if (!safe && !initOk) { // we are in none safe mode but init is not ok... Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -26,6 +26,9 @@ import org.apache.maven.model.IssueManagement; 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.project.MavenProject; import org.apache.maven.settings.Settings; import org.nuiton.helper.plugin.ShareServerSecretPlugin; @@ -41,23 +44,17 @@ * Obtain login for the redmine server to use. * * @author Tony Chemit <chemit@codelutin.com> Copyright Code Lutin - * @version $Revision$ - * <p/> - * Mise a jour: $Date$ par : - * $Author$ - * @goal login * @since 1.2.1 */ +@Mojo(name = "login", requiresOnline = true, requiresProject = true) public class LoginMojo extends AbstractPlugin implements RedmineServiceConfiguration { /** * Dependance du projet. * - * @parameter default-value="${project}" - * @required - * @readonly * @since 1.2.1 */ + @Component protected MavenProject project; /** @@ -65,33 +62,33 @@ * <p/> * If no url is given, will use the issue management url. * - * @parameter expression="${redmine.url}" * @since 1.2.1 */ + @Parameter(property = "redmine.url") protected URL url; /** * Un flag pour activer le mode verbeux. * - * @parameter expression="${redmine.verbose}" default-value="${maven.verbose}" * @since 1.2.1 */ + @Parameter(property = "redmine.verbose", defaultValue = "${maven.verbose}") protected boolean verbose; /** * Un flag pour verifier le login (effectue une connexion au serveur). * - * @parameter expression="${redmine.checkLogin}" default-value="false" * @since 1.2.1 */ + @Parameter(property = "redmine.checkLogin", defaultValue = "false") protected boolean checkLogin; /** * Un flag pour faire échouer le build si la configuration n'est pas ok. * - * @parameter expression="${redmine.safe}" default-value="true" * @since 1.2.1 */ + @Parameter(property = "redmine.safe", defaultValue = "true") protected boolean safe; /** @@ -99,28 +96,25 @@ * <p/> * The server must be defined in your settings.xml file in servers section. * - * @parameter expression="${redmine.serverId}" - * @required * @since 1.2.1 */ + @Parameter(property = "redmine.serverId", required = true) protected String serverId; /** - * Dependance du settings. + * Settings. * - * @parameter default-value="${settings}" - * @required - * @readonly * @since 1.2.1 */ + @Component protected Settings settings; /** - * password decypher + * password decypher. * - * @component roleHint="maven-helper-plugin" * @since 1.2.1 */ + @Component(hint = "helper-maven-plugin") protected SecDispatcher sec; /** @@ -129,6 +123,7 @@ * @component * @since 1.2.1 */ + @Component protected RedmineService service; /** Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; import org.nuiton.plugin.PluginHelper; @@ -40,9 +42,9 @@ * <p/> * * @author tchemit <chemit@codelutin.com> - * @goal next-version * @since 1.0.0 */ +@Mojo(name = "next-version", requiresOnline = true, requiresProject = true) public class NextVersionMojo extends AbstractRedmineMojo { /** @@ -51,9 +53,9 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** @@ -61,9 +63,9 @@ * <p/> * Note : if not set, no update of the description will be made. * - * @parameter expression="${redmine.versionDescription}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionDescription") protected String versionDescription; /** @@ -74,9 +76,9 @@ * If not Set - will use current day date. * flag is on. * - * @parameter expression="${redmine.effectiveDate}" * @since 1.0.0 */ + @Parameter(property = "redmine.effectiveDate") protected String effectiveDate; /** @@ -84,33 +86,33 @@ * <p/> * If not Set - will not move any issues to the new version. * - * @parameter expression="${redmine.previousVersionName}" * @since 1.0.0 */ + @Parameter(property = "redmine.previousVersionName") protected String previousVersionName; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipNextVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipNextVersion", defaultValue = "false") protected boolean skipNextVersion; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; /** effective date to set */ Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -26,6 +26,8 @@ import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.helper.plugin.CollectFilesMojo; import org.nuiton.jredmine.model.Attachment; import org.nuiton.plugin.PluginHelper; @@ -41,9 +43,9 @@ * Publish files for a given project and version on redmine server. * * @author tchemit <chemit@codelutin.com> - * @goal publish-attachments * @since 1.0.0 */ +@Mojo(name = "publish-attachments", requiresOnline = true, requiresProject = true) public class PublishAttachmentsMojo extends AbstractRedmineMojo { /** * Flag to know if anonymùous connexion to redmine server is required. @@ -51,9 +53,9 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** @@ -65,9 +67,9 @@ * <p/> * If no Set - will not use this source * - * @parameter expression="${redmine.filesFromProperties}" * @since 1.0.0 */ + @Parameter(property = "redmine.filesFromProperties") protected File filesFromProperties; /** @@ -75,33 +77,33 @@ * <p/> * If no Set - will not use this source * - * @parameter expression="${redmine.files}" * @since 1.0.0 */ + @Parameter(property = "redmine.files") protected File[] files; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipCollectReleaseAttachments}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipCollectReleaseAttachments", defaultValue = "false") protected boolean skipPublishAttachments; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; /** files to deploy */ Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.model.News; import org.nuiton.plugin.PluginHelper; @@ -34,9 +36,9 @@ * Publish a news on redmine server. * * @author tchemit <chemit@codelutin.com> - * @goal publish-news * @since 1.0.0 */ +@Mojo(name = "publish-news", requiresOnline = true, requiresProject = true) public class PublishNewsMojo extends AbstractRedmineMojo { /** * Flag to know if anonymùous connexion to redmine server is required. @@ -44,26 +46,25 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** * The content file of the news. * - * @parameter expression="${redmine.newsContentFile}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.newsContentFile", required = true) protected File newsContentFile; /** * Short description or introduction of the released artifact. * - * @parameter expression="${redmine.newsSummary}" * @since 1.0.0 */ + @Parameter(property = "redmine.newsSummary") protected String newsSummary; /** @@ -72,34 +73,33 @@ * <b>Note : </b> the size can not be more than 60 caracters (due to a * redmine limitation). * - * @parameter expression="${redmine.newsTitle}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.newsTitle", required = true) protected String newsTitle; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipPublishNews}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipPublishNews", defaultValue = "false") protected boolean skipPublishNews; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; public PublishNewsMojo() { Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.StringUtils; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; @@ -41,9 +43,9 @@ * Will add a the version if not existing, otherwise, will update the version. * * @author tchemit <chemit@codelutin.com> - * @goal update-version * @since 1.0.0 */ +@Mojo(name = "update-version", requiresOnline = true, requiresProject = true) public class UpdateVersionMojo extends AbstractRedmineMojo { /** * Flag to know if anonymùous connexion to redmine server is required. @@ -51,9 +53,9 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** @@ -61,9 +63,9 @@ * <p/> * Note : if not set, no update of the description will be made. * - * @parameter expression="${redmine.versionDescription}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionDescription") protected String versionDescription; /** @@ -71,9 +73,9 @@ * <p/> * The status of the version will be setted to {@code closed} then. * - * @parameter expression="${redmine.closeVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.closeVersion", defaultValue = "false") protected boolean closeVersion; /** @@ -84,9 +86,9 @@ * If not Set - will use current day date only if {@link #closeVersion} * flag is on. * - * @parameter expression="${redmine.effectiveDate}" * @since 1.0.0 */ + @Parameter(property = "redmine.effectiveDate") protected String effectiveDate; /** @@ -95,33 +97,33 @@ * If not Set - will use the {@code closed} value only if * {@link #closeVersion} flag is on. * - * @parameter expression="${redmine.versionStatus}" * @since 1.2.1 */ + @Parameter(property = "redmine.versionStatus") protected String versionStatus; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipUpdateVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipUpdateVersion", defaultValue = "false") protected boolean skipUpdateVersion; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -26,6 +26,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.changes.ChangesXML; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.codehaus.plexus.util.ReaderFactory; @@ -40,10 +42,7 @@ import java.util.List; import java.util.Map; -/** - * @author tchemit <chemit@codelutin.com> - * @requiresOnline true - */ +/** @author tchemit <chemit@codelutin.com> */ public abstract class AbstractAnnouncementMojo extends AbstractRedmineMojo implements AnnouncementGeneratorConfiguration { /** @@ -54,27 +53,25 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "true") protected boolean anonymous; /** * Directory where the template file will be generated. * - * @parameter expression="${redmine.templateOutputDirectory}" default-value="${project.build.directory}/generated-sources/announcement" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.templateOutputDirectory", defaultValue = "${project.build.directory}/generated-sources/announcement", required = true) protected File templateOutputDirectory; /** * The path of the changes.xml file. * - * @parameter expression="${redmine.xmlPath}" default-value="${basedir}/src/changes/changes.xml" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.xmlPath", defaultValue = "${basedir}/src/changes/changes.xml", required = true) protected File xmlPath; /** @@ -84,26 +81,25 @@ * <code>/src/main/resources/ or current project base directory</code>. * </p> * - * @parameter expression="${redmine.templateDirectory}" default-value="org/nuiton/jredmine/plugin/announcement" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.templateDirectory", defaultValue = "org/nuiton/jredmine/plugin/announcement", required = true) protected String templateDirectory = "org/nuiton/jredmine/plugin/announcement"; /** * The template encoding. * - * @parameter expression="${redmine.templateEncoding}" default-value="${project.build.sourceEncoding}" * @since 1.0.0 */ + @Parameter(property = "redmine.templateEncoding", defaultValue = "${project.build.sourceEncoding}") protected String templateEncoding; /** * Map which will be pass to the velocity context * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, Object> announceParameters; /** @@ -115,59 +111,49 @@ * and everything that comes after it. <code>%FILE%</code>: this is the issue number. * </p> * - * @parameter expression="${redmine.attachmentLinkTemplate}" default-value="%URL%/attachments/download/%FILE%" * @since 1.0.0 */ - protected String attachmentLinkTemplate ="%URL%/attachments/download/%FILE%"; + @Parameter(property = "redmine.attachmentLinkTemplate", defaultValue = "%URL%/attachments/download/%FILE%") + protected String attachmentLinkTemplate = "%URL%/attachments/download/%FILE%"; - /** - * @parameter expression="${project.groupId}" - * @readonly - * @since 1.0.0 - */ + /** @since 1.0.0 */ + @Parameter(property = "project.groupId", readonly = true) protected String groupId; - /** - * @parameter expression="${project.artifactId}" - * @readonly - * @since 1.0.0 - */ + /** @since 1.0.0 */ + @Parameter(property = "project.artifactId", readonly = true) protected String artifactId; /** * Distribution url of the artifact. * - * @parameter expression="${redmine.projectUrl}" default-value="${project.url}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.projectUrl", defaultValue = "${project.url}", required = true) protected String projectUrl; /** * Packaging structure for the artifact. * - * @parameter expression="${project.packaging}" - * @readonly * @since 1.0.0 */ + @Parameter(property = "project.packaging", readonly = true) protected String packaging; /** * The name of the artifact to be used in the announcement. * - * @parameter expression="${redmine.finalName}" default-value="${project.build.finalName}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.finalName", defaultValue = "${project.build.finalName}", required = true) protected String finalName; /** * The current project base directory. * - * @parameter expression="${basedir}" - * @required * @since 1.0.0 */ + @Parameter(property = "basedir", required = true) protected String basedir; /** @@ -177,50 +163,45 @@ * @parameter * @since 1.0.0 */ + @Parameter protected String urlDownload; /** * Name of the team that develops the artifact. * - * @parameter expression="${redmine.developmentTeam}" default-value="${project.name} team" * @required * @since 1.0.0 */ + @Parameter(property = "redmine.developmentTeam", defaultValue = "${project.name} team", required = true) protected String developmentTeam; /** * Short description or introduction of the released artifact. * - * @parameter expression="${redmine.introduction}" default-value="${project.description}" * @since 1.0.0 */ + @Parameter(property = "redmine.introduction", defaultValue = "${project.description}") protected String introduction; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; - /** - * @parameter expression="${redmine.artifactsFile}" - * @since 1.2.1 - */ + /** @since 1.2.1 */ + @Parameter(property = "redmine.artifactsFile") protected File artifactsFile; /** - * @parameter expression="${redmine.deploymentUrl}" - * @readonly */ + @Parameter(property = "redmine.deploymentUrl", readonly = true) protected String deploymentUrl; - /** - * Velocity Component. - * - * @component roleHint="jredmine-maven-plugin" - */ + /** Velocity Component. */ + @Component(hint = "jredmine-maven-plugin") protected VelocityComponent velocity; protected Attachment[] attachments; Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,30 +24,32 @@ */ package org.nuiton.jredmine.plugin.announcement; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + /** * Generate the content of the release email announcement. * * @author tchemit <chemit@codelutin.com> - * @goal generate-email-announcement * @since 1.0.0 */ +@Mojo(name = "generate-email-announcement", requiresOnline = true, requiresProject = true) public class GenerateEmailAnnouncementMojo extends AbstractAnnouncementMojo { /** * The Velocity template used to format the release email announcement. * - * @parameter expression="${redmine.emailAnnouncementTemplate}" default-value="release-email-announcement.vm" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.emailAnnouncementTemplate", defaultValue = "release-email-announcement.vm", required = true) protected String emailAnnouncementTemplate = "release-email-announcement.vm"; /** * A flag to enable or disable the goal. * - * @parameter expression="${changes.skipGenerateEmailAnnouncement}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "changes.skipGenerateEmailAnnouncement", defaultValue = "false") protected boolean skipGenerateEmailAnnouncement; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,30 +24,32 @@ */ package org.nuiton.jredmine.plugin.announcement; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + /** * Generate the content of the release announcement news for Redmine. * * @author tchemit <chemit@codelutin.com> - * @goal generate-news-announcement * @since 1.0.0 */ +@Mojo(name = "generate-news-announcement", requiresOnline = true, requiresProject = true) public class GenerateNewsAnnouncementMojo extends AbstractAnnouncementMojo { /** * The Velocity template used to format the redmine announcement. * - * @parameter expression="${redmine.newsAnnouncementTemplate}" default-value="release-news-announcement.vm" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.newsAnnouncementTemplate", defaultValue = "release-news-announcement.vm", required = true) protected String newsAnnouncementTemplate = "release-news-announcement.vm"; /** * A flag to enable or disable the goal. * - * @parameter expression="${redmine.skipGenerateNewsAnnouncement}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipGenerateNewsAnnouncement", defaultValue = "false") protected boolean skipGenerateNewsAnnouncement; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-07-13 15:35:06 UTC (rev 279) @@ -42,6 +42,7 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.i18n.I18N; @@ -60,7 +61,6 @@ * Abstract redmine report mojo. * * @author tchemit <chemit@codelutin.com> - * @requiresReports true * @since 1.0.0 */ public abstract class AbstractRedmineReport extends AbstractRedmineMojo implements MavenReport { @@ -73,9 +73,9 @@ * <b>Note:</b> If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "true") protected boolean anonymous; /** @@ -87,9 +87,9 @@ * and everything that comes after it. <code>%ISSUE%</code>: this is the issue number. * </p> * - * @parameter expression="${redmine.issueLinkTemplate}" default-value="%URL%/issues/show/%ISSUE%" * @since 1.0.0 */ + @Parameter(property = "redmine.issueLinkTemplate", defaultValue = "%URL%/issues/show/%ISSUE%") protected String issueLinkTemplate = "%URL%/issues/show/%ISSUE%"; /** @@ -101,27 +101,21 @@ * and everything that comes after it. <code>%VERSION%</code>: this is the issue number. * </p> * - * @parameter expression="${redmine.versionLinkTemplate}" default-value="%URL%/versions/show/%VERSION%" * @since 1.0.0 */ + @Parameter(property = "redmine.versionLinkTemplate", defaultValue = "%URL%/versions/show/%VERSION%") protected String versionLinkTemplate = "%URL%/versions/show/%VERSION%"; - /** - * Local Repository. - * - * @parameter expression="${localRepository}" - * @required - * @readonly - */ + /** Local Repository. */ + @Parameter(property = "localRepository", required = true, readonly = true) protected ArtifactRepository localRepository; /** * Report output directory. Note that this parameter is only relevant if the goal is run from the command line or * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output * directory configured in the Maven Site Plugin is used instead. - * - * @parameter default-value="${project.reporting.outputDirectory}" */ + @Parameter(defaultValue = "${project.reporting.outputDirectory}") protected File outputDirectory; /** @component */ @@ -357,8 +351,8 @@ null); resolver.resolveAlways(artifact, - project.getRemoteArtifactRepositories(), - localRepository); + project.getRemoteArtifactRepositories(), + localRepository); } catch (InvalidVersionSpecificationException e) { throw new MojoExecutionException( "The skin version '" + version + Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server * * @author tchemit <chemit@codelutin.com> - * @goal issues-report * @since 1.0.0 */ +@Mojo(name = "issues-report", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReport extends AbstractIssuesReport { /** @@ -43,6 +46,7 @@ * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntries; /** @@ -50,9 +54,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersion; /** @@ -81,9 +85,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filters; /** @@ -98,9 +102,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 1.0.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNames; /** @@ -109,9 +113,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReport}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReport", defaultValue = "false") protected boolean skipIssueReport; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by assignee. * * @author tchemit <chemit@codelutin.com> - * @goal issues-report-by-assignee * @since 1.0.0 */ +@Mojo(name = "issues-report-by-assignee", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByAssignee extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByAssignee; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByAssignee; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByAssignee; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByAssignee; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByAssignee}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByAssignee", defaultValue = "false") protected boolean skipIssueReportByAssignee; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by category. * * @author tchemit <chemit@codelutin.com> - * @goal issues-report-by-category * @since 1.0.0 */ +@Mojo(name = "issues-report-by-category", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByCategory extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByCategory; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByCategory; /** @@ -81,9 +84,9 @@ * mvn redmine:display-data -Dtypes=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByCategory; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByCategory; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByCategory}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByCategory", defaultValue = "false") protected boolean skipIssueReportByCategory; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by priority. * * @author tchemit <chemit@codelutin.com> - * @goal issues-report-by-priority * @since 1.0.0 */ +@Mojo(name = "issues-report-by-priority", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByPriority extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByPriority; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByPriority; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByPriority; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByPriority; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByPriority}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByPriority", defaultValue = "false") protected boolean skipIssueReport; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by reporter. * * @author tchemit <chemit@codelutin.com> - * @goal issues-report-by-reporter * @since 1.0.0 */ +@Mojo(name = "issues-report-by-reporter", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByReporter extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByReporter; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByReporter; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByReporter; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByReporter; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByReporter}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByReporter", defaultValue = "false") protected boolean skipIssueReportByReporter; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,6 +24,9 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** @@ -33,6 +36,7 @@ * @goal issues-report-by-status * @since 1.0.0 */ +@Mojo(name = "issues-report-by-status", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByStatus extends AbstractIssuesReport { /** @@ -40,9 +44,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByStatus; /** @@ -50,9 +54,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByStatus; /** @@ -81,9 +85,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByStatus; /** @@ -98,9 +102,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByStatus; /** @@ -109,9 +113,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByStatus}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByStatus", defaultValue = "false") protected boolean skipIssueReportByStatus; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by tracker. * * @author tchemit <chemit@codelutin.com> - * @goal issues-report-by-tracker * @since 1.0.0 */ +@Mojo(name = "issues-report-by-tracker", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByTracker extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByTracker; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByTracker; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByTracker; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByTracker; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByTracker}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByTracker", defaultValue = "false") protected boolean skipIssueReportByTracker; @Override Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2012-07-13 10:26:19 UTC (rev 278) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2012-07-13 15:35:06 UTC (rev 279) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by version. * * @author tchemit <chemit@codelutin.com> - * @goal issues-report-by-version * @since 1.0.0 */ +@Mojo(name = "issues-report-by-version", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByVersion extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * <p/> * <b>Note:</b> use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByVersion; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByVersion; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByVersion; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * </p> * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByVersion; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByVersion", defaultValue = "false") protected boolean skipIssueReportByVersion; @Override