- Jredmine-commits - mailman.cloud.codelutin.com

r403 - in trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin: . announcement
by tchemit＠users.nuiton.org 07 Aug '13

07 Aug '13

Author: tchemit Date: 2013-08-07 19:16:13 +0200 (Wed, 07 Aug 2013) New Revision: 403 Url: http://nuiton.org/projects/jredmine/repository/revisions/403 Log: fixes #2804: Even when skip flag is on, there is some code executed on goals fixes #2806: Can not use generate mojo on a none root module 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/GenerateChangesMojo.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 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -43,8 +43,6 @@ * Abstract redmine mojo. * * @author tchemit <chemit(a)codelutin.com> - * @requiresOnline true - * @requiresProject true * @since 1.0.0 */ public abstract class AbstractRedmineMojo extends AbstractPlugin implements RedmineServiceConfiguration { 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -302,6 +302,10 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + if (xmlPath == null || xmlPath.getAbsolutePath().trim().isEmpty()) { throw new MojoExecutionException("required a xmlPath parameter"); } @@ -312,17 +316,7 @@ versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } - } - - if (isGoalSkip()) { - getLog().warn("The goal is skip due to the skipGoal flag on"); + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { return; } 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -174,7 +174,17 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + // compute unique key + StringBuilder buffer = new StringBuilder("next-version"); + buffer.append("##").append(projectId); + buffer.append("##").append(versionId); + buffer.append("##").append(releaseVersion); + buffer.append("##").append(versionDescription); + buffer.append("##").append(previousVersionName); + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } /////////////////////////////////////////////////////////////////////////// @@ -184,19 +194,18 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + if (StringUtils.isBlank(versionId)) { throw new MojoExecutionException("required a versionId parameter"); } versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } if (StringUtils.isNotBlank(effectiveDate)) { 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -166,7 +166,16 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + + // compute unique key + StringBuilder buffer = new StringBuilder("publish-attachments"); + for (File allFile : allFiles) { + buffer.append("##").append(allFile); + } + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } /////////////////////////////////////////////////////////////////////////// @@ -176,6 +185,10 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + versionId = PluginHelper.removeSnapshotSuffix(versionId); if (filesFromProperties != null && !filesFromProperties.exists()) { @@ -201,13 +214,8 @@ return; } - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } super.init(); 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -150,7 +150,15 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + // compute unique key + StringBuilder buffer = new StringBuilder("publish-news"); + buffer.append("##").append(newsTitle); + buffer.append("##").append(newsSummary); + buffer.append("##").append(newsContentFile); + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } @Override @@ -165,6 +173,10 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + runOnceDone = false; if (isRunOnce()) { 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -63,7 +63,7 @@ protected boolean anonymous; /** - * The news description to update to redmine server. + * The version description to update to redmine server. * <p/> * Note : if not set, no update of the description will be made. * @@ -192,7 +192,17 @@ @Override protected boolean checkRunOnceDone() { - return isRunOnce() && !isExecutionRoot(); + // compute unique key + StringBuilder buffer = new StringBuilder("update-version"); + buffer.append("##").append(projectId); + buffer.append("##").append(versionId); + buffer.append("##").append(releaseVersion); + buffer.append("##").append(versionDescription); + buffer.append("##").append(versionStatus); + + String key = buffer.toString(); + + return !needInvoke(runOnce, false, key); } /////////////////////////////////////////////////////////////////////////// @@ -202,19 +212,18 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + if (StringUtils.isBlank(versionId)) { throw new MojoExecutionException("required a versionId parameter"); } versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } if (StringUtils.isNotBlank(effectiveDate)) { 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 2013-08-07 17:09:19 UTC (rev 402) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2013-08-07 17:16:13 UTC (rev 403) @@ -44,7 +44,6 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @requiresOnline true */ public abstract class AbstractAnnouncementMojo extends AbstractRedmineMojoWithProjectAndVersion implements AnnouncementGeneratorConfiguration { @@ -128,7 +127,7 @@ * * @since 1.0.0 */ - @Parameter(property = "project.groupId", readonly = true) + @Parameter(property = "session.topLevelProject.groupId", readonly = true) protected String groupId; /** @@ -136,7 +135,7 @@ * * @since 1.0.0 */ - @Parameter(property = "project.artifactId", readonly = true) + @Parameter(property = "session.topLevelProject.artifactId", readonly = true) protected String artifactId; /** @@ -144,7 +143,7 @@ * * @since 1.0.0 */ - @Parameter(property = "redmine.projectUrl", defaultValue = "${project.url}", required = true) + @Parameter(property = "redmine.projectUrl", defaultValue = "${session.topLevelProject.url}", required = true) protected String projectUrl; /** @@ -160,7 +159,7 @@ * * @since 1.0.0 */ - @Parameter(property = "redmine.finalName", defaultValue = "${project.build.finalName}", required = true) + @Parameter(property = "redmine.finalName", defaultValue = "${session.topLevelProject.build.finalName}", required = true) protected String finalName; /** @@ -187,7 +186,7 @@ * @required * @since 1.0.0 */ - @Parameter(property = "redmine.developmentTeam", defaultValue = "${project.name} team", required = true) + @Parameter(property = "redmine.developmentTeam", defaultValue = "${session.topLevelProject.name} team", required = true) protected String developmentTeam; /** @@ -195,7 +194,7 @@ * * @since 1.0.0 */ - @Parameter(property = "redmine.introduction", defaultValue = "${project.description}") + @Parameter(property = "redmine.introduction", defaultValue = "${session.topLevelProject.description}") protected String introduction; /** @@ -360,17 +359,16 @@ @Override protected boolean checkRunOnceDone() { - String template = getAnnouncementTemplate(); File out = getOutputFile(); Date buildStartTime = session == null ? null : session.getStartTime(); Date newStartTime = out.exists() ? new Date(out.lastModified()) : null; - boolean checkRunOnceDone = checkRunOnceDone(runOnce, - true, - buildStartTime, - newStartTime + boolean needInvoke = needInvoke(runOnce, + false, + buildStartTime, + newStartTime ); - return checkRunOnceDone; + return !needInvoke; } /////////////////////////////////////////////////////////////////////////// @@ -380,15 +378,14 @@ @Override protected void init() throws Exception { + if (isGoalSkip()) { + return; + } + versionId = PluginHelper.removeSnapshotSuffix(versionId); - runOnceDone = false; - - if (isRunOnce()) { - runOnceDone = checkRunOnceDone(); - if (runOnceDone) { - return; - } + if (runOnceDone = isRunOnce() && checkRunOnceDone()) { + return; } if (!xmlPath.exists()) { @@ -403,9 +400,9 @@ templateEncoding + ", i.e. build is platform dependent!"); } - if (StringUtils.isEmpty(introduction)) { - introduction = project.getUrl(); - } +// if (StringUtils.isEmpty(introduction)) { +// introduction = project.getUrl(); +// } generator = new AnnouncementGenerator(this);

1 0

r402 - trunk
by tchemit＠users.nuiton.org 07 Aug '13

07 Aug '13

Author: tchemit Date: 2013-08-07 19:09:19 +0200 (Wed, 07 Aug 2013) New Revision: 402 Url: http://nuiton.org/projects/jredmine/repository/revisions/402 Log: refs #2411: Updates to helper-maven-plugin 2.1 fixes #2424: Updates to mavenpom 3.4.13 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 11:28:45 UTC (rev 401) +++ trunk/pom.xml 2013-08-07 17:09:19 UTC (rev 402) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>3.4.13</version> </parent> <artifactId>jredmine</artifactId> @@ -60,6 +60,7 @@  <jredminePluginVersion>1.5.1</jredminePluginVersion> + <helperPluginVersion>2.1-SNAPSHOT</helperPluginVersion> <doxiaVersion>1.3</doxiaVersion>

1 0

r401 - trunk
by tchemit＠users.nuiton.org 29 Dec '12

29 Dec '12

Author: tchemit Date: 2012-12-29 12:28:45 +0100 (Sat, 29 Dec 2012) New Revision: 401 Url: http://nuiton.org/projects/jredmine/repository/revisions/401 Log: Update mavenpom4redmineAndCentral to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-18 17:50:01 UTC (rev 400) +++ trunk/pom.xml 2012-12-29 11:28:45 UTC (rev 401) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.6</version> + <version>3.4.7</version> </parent> <artifactId>jredmine</artifactId>

1 0

r400 - in trunk: . jredmine-maven-plugin
by tchemit＠users.nuiton.org 18 Dec '12

18 Dec '12

Author: tchemit Date: 2012-12-18 18:50:01 +0100 (Tue, 18 Dec 2012) New Revision: 400 Url: http://nuiton.org/projects/jredmine/repository/revisions/400 Log: optmize dependencies Modified: trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-12-18 17:18:57 UTC (rev 399) +++ trunk/jredmine-maven-plugin/pom.xml 2012-12-18 17:50:01 UTC (rev 400) @@ -172,6 +172,11 @@ <artifactId>doxia-sink-api</artifactId> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> +  <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-18 17:18:57 UTC (rev 399) +++ trunk/pom.xml 2012-12-18 17:50:01 UTC (rev 400) @@ -431,10 +431,20 @@ <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.04</version> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4jVersion}</version>

1 0

r399 - in trunk: jredmine-client jredmine-maven-plugin
by tchemit＠users.nuiton.org 18 Dec '12

18 Dec '12

Author: tchemit Date: 2012-12-18 18:18:57 +0100 (Tue, 18 Dec 2012) New Revision: 399 Url: http://nuiton.org/projects/jredmine/repository/revisions/399 Log: fixes #2486: Use same profile to run its (named run-its) Modified: trunk/jredmine-client/pom.xml trunk/jredmine-maven-plugin/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2012-12-18 17:06:12 UTC (rev 398) +++ trunk/jredmine-client/pom.xml 2012-12-18 17:18:57 UTC (rev 399) @@ -215,13 +215,13 @@ </profile> <profile> - <id>run-client-its</id> -  + </activation> <build> <defaultGoal>integration-test</defaultGoal> <plugins> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-12-18 17:06:12 UTC (rev 398) +++ trunk/jredmine-maven-plugin/pom.xml 2012-12-18 17:18:57 UTC (rev 399) @@ -242,13 +242,13 @@ </reporting> </profile> <profile> - <id>run-plugin-its</id> -  + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> <build> <defaultGoal>integration-test</defaultGoal>

1 0

r398 - trunk/jredmine-client/src/site/apt
by tchemit＠users.nuiton.org 18 Dec '12

18 Dec '12

Author: tchemit Date: 2012-12-18 18:06:12 +0100 (Tue, 18 Dec 2012) New Revision: 398 Url: http://nuiton.org/projects/jredmine/repository/revisions/398 Log: fixes #2485: Improve jredmine rails plugin install doc Modified: trunk/jredmine-client/src/site/apt/index.apt Modified: trunk/jredmine-client/src/site/apt/index.apt =================================================================== --- trunk/jredmine-client/src/site/apt/index.apt 2012-12-18 17:05:41 UTC (rev 397) +++ trunk/jredmine-client/src/site/apt/index.apt 2012-12-18 17:06:12 UTC (rev 398) @@ -118,6 +118,11 @@ * dézippage dans le répertoire vendor/plugins (ou plugins pour redmine 2.0) + * Attention, le répertoire dézippé contient le numéro de version, alors que + redmine attend à avoir un répertoire <jredmine>, nous préconisons + l'utilisation d'un lien symbolique nommé jredmine vers le répertoire + dézippé (et ceci pour bien savoir quelle version est utilisée). + * relancer votre instance de redmine (ou apache). * Configuration des permissions du plugin dans le serveur Redmine

1 0

r397 - trunk
by tchemit＠users.nuiton.org 18 Dec '12

18 Dec '12

Author: tchemit Date: 2012-12-18 18:05:41 +0100 (Tue, 18 Dec 2012) New Revision: 397 Url: http://nuiton.org/projects/jredmine/repository/revisions/397 Log: fixes #2424: Updates to mavenpom 3.4.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 16:15:44 UTC (rev 396) +++ trunk/pom.xml 2012-12-18 17:05:41 UTC (rev 397) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4</version> + <version>3.4.6</version> </parent> <artifactId>jredmine</artifactId>

1 0

r396 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:15:44 +0100 (Fri, 16 Nov 2012) New Revision: 396 Url: http://nuiton.org/repositories/revision/jredmine/396 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 15:34:26 UTC (rev 395) +++ trunk/pom.xml 2012-11-16 16:15:44 UTC (rev 396) @@ -78,7 +78,7 @@ <developerConnection> scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <url>http://nuiton.org/projects/jredmine/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r395 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 16:34:26 +0100 (Fri, 16 Nov 2012) New Revision: 395 Url: http://nuiton.org/repositories/revision/jredmine/395 Log: fixes #2424: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 19:28:35 UTC (rev 394) +++ trunk/pom.xml 2012-11-16 15:34:26 UTC (rev 395) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4-SNAPSHOT</version> + <version>3.4.4</version> </parent> <artifactId>jredmine</artifactId>

1 0

r394 - trunk
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 20:28:35 +0100 (Sun, 11 Nov 2012) New Revision: 394 Url: http://nuiton.org/repositories/revision/jredmine/394 Log: refs #2424: Updates to mavenpom 3.4.4 fixes #2411: Updates to helper-maven-plugin 2.0 use last jredmine version (for jredmine internal release) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 09:10:44 UTC (rev 393) +++ trunk/pom.xml 2012-11-11 19:28:35 UTC (rev 394) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <artifactId>jredmine</artifactId> @@ -58,10 +58,8 @@ <projectId>jredmine</projectId> - <helperPluginVersion>2.0-SNAPSHOT</helperPluginVersion> -  - <jredminePluginVersion>1.5</jredminePluginVersion> + <jredminePluginVersion>1.5.1</jredminePluginVersion> <doxiaVersion>1.3</doxiaVersion> @@ -118,7 +116,6 @@ <version>${httpCommonsHttpclientVersion}</version> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> @@ -152,7 +149,6 @@ <scope>compile</scope> <exclusions> - <exclusion> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId>

1 0