- Maven-helper-plugin-commits - mailman.cloud.codelutin.com

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

29 Dec '12

Author: tchemit Date: 2012-12-29 12:29:00 +0100 (Sat, 29 Dec 2012) New Revision: 894 Url: http://nuiton.org/projects/maven-helper-plugin/repository/revisions/894 Log: Update mavenpom4redmineAndCentral to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 15:34:31 UTC (rev 893) +++ trunk/pom.xml 2012-12-29 11:29:00 UTC (rev 894) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4</version> + <version>3.4.7</version> </parent> <artifactId>helper-maven-plugin-parent</artifactId> @@ -113,7 +113,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.8</version> + <version>3.0.9</version> </dependency> <dependency>

1 0

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

16 Nov '12

Author: tchemit Date: 2012-11-16 16:34:31 +0100 (Fri, 16 Nov 2012) New Revision: 893 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/893 Log: Update mavenpom4redmineAndCentral to 3.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 19:20:10 UTC (rev 892) +++ trunk/pom.xml 2012-11-16 15:34:31 UTC (rev 893) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <artifactId>helper-maven-plugin-parent</artifactId>

1 0

r892 - trunk/helper-maven-plugin-api/src/main/java/org/nuiton/io
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 20:20:10 +0100 (Sun, 11 Nov 2012) New Revision: 892 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/892 Log: fixes #2409: Remove deprecated xpp3 api Removed: trunk/helper-maven-plugin-api/src/main/java/org/nuiton/io/xpp3/

1 0

r891 - in trunk: . helper-maven-plugin helper-maven-plugin-api
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 19:50:54 +0100 (Sun, 11 Nov 2012) New Revision: 891 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/891 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/helper-maven-plugin-api/pom.xml trunk/helper-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/helper-maven-plugin/pom.xml =================================================================== --- trunk/helper-maven-plugin/pom.xml 2012-11-11 18:50:52 UTC (rev 890) +++ trunk/helper-maven-plugin/pom.xml 2012-11-11 18:50:54 UTC (rev 891) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>helper-maven-plugin</artifactId> Modified: trunk/helper-maven-plugin-api/pom.xml =================================================================== --- trunk/helper-maven-plugin-api/pom.xml 2012-11-11 18:50:52 UTC (rev 890) +++ trunk/helper-maven-plugin-api/pom.xml 2012-11-11 18:50:54 UTC (rev 891) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>helper-maven-plugin-api</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 18:50:52 UTC (rev 890) +++ trunk/pom.xml 2012-11-11 18:50:54 UTC (rev 891) @@ -31,7 +31,7 @@ </parent> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <name>Helper Maven Plugin</name> <description>Toolbox to help creating new maven plugins</description> @@ -70,13 +70,13 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk </developerConnection> <url> - http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he… + http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk </url> </scm>

1 0

r890 - in tags: . maven-helper-plugin-2.0
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 19:50:52 +0100 (Sun, 11 Nov 2012) New Revision: 890 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/890 Log: [maven-release-plugin] copy for tag maven-helper-plugin-2.0 Added: tags/maven-helper-plugin-2.0/ Property changes on: tags/maven-helper-plugin-2.0 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.log .project .classpath .settings target .idea Added: svn:mergeinfo +

1 0

r889 - in trunk: . helper-maven-plugin helper-maven-plugin-api
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 19:50:50 +0100 (Sun, 11 Nov 2012) New Revision: 889 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/889 Log: [maven-release-plugin] prepare release maven-helper-plugin-2.0 Modified: trunk/helper-maven-plugin-api/pom.xml trunk/helper-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/helper-maven-plugin/pom.xml =================================================================== --- trunk/helper-maven-plugin/pom.xml 2012-11-11 18:18:31 UTC (rev 888) +++ trunk/helper-maven-plugin/pom.xml 2012-11-11 18:50:50 UTC (rev 889) @@ -20,16 +20,14 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <artifactId>helper-maven-plugin</artifactId> Modified: trunk/helper-maven-plugin-api/pom.xml =================================================================== --- trunk/helper-maven-plugin-api/pom.xml 2012-11-11 18:18:31 UTC (rev 888) +++ trunk/helper-maven-plugin-api/pom.xml 2012-11-11 18:50:50 UTC (rev 889) @@ -20,16 +20,14 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <artifactId>helper-maven-plugin-api</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 18:18:31 UTC (rev 888) +++ trunk/pom.xml 2012-11-11 18:50:50 UTC (rev 889) @@ -20,9 +20,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -33,7 +31,7 @@ </parent> <artifactId>helper-maven-plugin-parent</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <name>Helper Maven Plugin</name> <description>Toolbox to help creating new maven plugins</description> @@ -72,13 +70,13 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… </developerConnection> <url> - http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk + http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he… </url> </scm>

1 0

r888 - trunk/helper-maven-plugin/src/site
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 19:18:31 +0100 (Sun, 11 Nov 2012) New Revision: 888 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/888 Log: refs #2422: Introduce a new mojo to transform a project version (add mojo doc) Modified: trunk/helper-maven-plugin/src/site/site_en.xml Modified: trunk/helper-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/helper-maven-plugin/src/site/site_en.xml 2012-11-11 18:04:30 UTC (rev 887) +++ trunk/helper-maven-plugin/src/site/site_en.xml 2012-11-11 18:18:31 UTC (rev 888) @@ -51,6 +51,7 @@ <item name="share-server-secret" href="share-server-secret-mojo.html"/> <item name="send-email" href="send-email-mojo.html"/> <item name="check-auto-container" href="check-auto-container-mojo.html"/> + <item name="transform-project-version" href="transform-project-version-mojo.html"/> <item name="help" href="help-mojo.html"/> </item> <item name="Mojo usages" href="mojo-usages.html"/>

1 0

r887 - trunk/helper-maven-plugin/src/site/apt
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 19:04:30 +0100 (Sun, 11 Nov 2012) New Revision: 887 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/887 Log: refs #2422: Introduce a new mojo to transform a project version (add mojo doc) Modified: trunk/helper-maven-plugin/src/site/apt/index.apt trunk/helper-maven-plugin/src/site/apt/mojo-examples.apt trunk/helper-maven-plugin/src/site/apt/mojo-usages.apt Modified: trunk/helper-maven-plugin/src/site/apt/index.apt =================================================================== --- trunk/helper-maven-plugin/src/site/apt/index.apt 2012-11-11 13:03:02 UTC (rev 886) +++ trunk/helper-maven-plugin/src/site/apt/index.apt 2012-11-11 18:04:30 UTC (rev 887) @@ -43,6 +43,8 @@ * {{{./check-auto-container-mojo.html} helper:check-auto-container}} to check if project is auto-contained in some repositories. + * {{{./transform-project-version-mojo.html} helper:transform-project-version}} to compute a version using a revision and a pattern and store it in your model. + Consult the {{{./mojo-usages.html}usages}} page to have more details of mojos. Consult the {{{./mojo-examples.html}examples}} page to have some examples of mojos. Modified: trunk/helper-maven-plugin/src/site/apt/mojo-examples.apt =================================================================== --- trunk/helper-maven-plugin/src/site/apt/mojo-examples.apt 2012-11-11 13:03:02 UTC (rev 886) +++ trunk/helper-maven-plugin/src/site/apt/mojo-examples.apt 2012-11-11 18:04:30 UTC (rev 887) @@ -129,21 +129,21 @@ -------------------------------------------------------------------------------- <plugin> -<groupId>org.nuiton</groupId> -<artifactId>helper-maven-plugin</artifactId> -<executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <phase>validate</phase> - <configuration> - <addMavenCentral>true</addMavenCentral> - </configuration> - </execution> -</executions> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <addMavenCentral>true</addMavenCentral> + </configuration> + </execution> + </executions> </plugin> -------------------------------------------------------------------------------- @@ -155,24 +155,48 @@ -------------------------------------------------------------------------------- <plugin> -<groupId>org.nuiton</groupId> -<artifactId>helper-maven-plugin</artifactId> -<executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <phase>validate</phase> - <configuration> - <repositories> - <nuiton-central-releases> - http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases - </nuiton-central-releases> - </repositories> - </configuration> - </execution> -</executions> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <phase>validate</phase> + <configuration> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> + </executions> </plugin> -------------------------------------------------------------------------------- + +transform-project-version + + Compute your project version {1.0} with a injected scm revision + +-------------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + <phase>validate</phase> + <configuration> + <revision>2</revision> + </configuration> + </execution> + </executions> +</plugin> +-------------------------------------------------------------------------------- + + The result {1.0-rev-2} will be stored in property {newVersion}. Modified: trunk/helper-maven-plugin/src/site/apt/mojo-usages.apt =================================================================== --- trunk/helper-maven-plugin/src/site/apt/mojo-usages.apt 2012-11-11 13:03:02 UTC (rev 886) +++ trunk/helper-maven-plugin/src/site/apt/mojo-usages.apt 2012-11-11 18:04:30 UTC (rev 887) @@ -106,4 +106,12 @@ [] See {{{./mojo-examples.html#check-auto-container}examples page}}. - \ No newline at end of file + +transform-project-version + + This mojo permits to transform your project version and store the result in a + model property. + + Note that the version is not changed in your pom, but just computed. + + See {{{./mojo-examples.html#transform-project-version}examples page}}.

1 0

r886 - in trunk/helper-maven-plugin/src: main/java/org/nuiton/helper/plugin test/java/org/nuiton/helper/plugin test/resources/org/nuiton/helper/plugin test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 14:03:02 +0100 (Sun, 11 Nov 2012) New Revision: 886 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/886 Log: fixes #2422: Introduce a new mojo to transform a project version Added: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/TransformProjectVersionMojo.java trunk/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/TransformProjectVersionMojoTest.java trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern1.xml trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern2.xml trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern3.xml trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/keepSnapshot.xml trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/removeSnapshot.xml trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/simple.xml Added: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/TransformProjectVersionMojo.java =================================================================== --- trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/TransformProjectVersionMojo.java (rev 0) +++ trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/TransformProjectVersionMojo.java 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,235 @@ +package org.nuiton.helper.plugin; + +/* + * #%L + * Helper Maven Plugin :: Mojos + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProject; +import org.nuiton.plugin.AbstractPlugin; + +import java.util.Properties; + +/** + * Transform the version of the project and store it in a project property. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +@Mojo(name = "transform-project-version", + defaultPhase = LifecyclePhase.INITIALIZE, + aggregator = true, + requiresProject = true) +public class TransformProjectVersionMojo extends AbstractPlugin { + + public static final String SNAPSHOT_SUFFIX = "-SNAPSHOT"; + + /** + * Project. + * + * @since 2.0 + */ + @Component + private MavenProject project; + + /** + * Scm revision to use. + * + * @since 2.0 + */ + @Parameter(property = "helper.revision", required = true) + private String revision; + + + /** + * Pattern of the new version. + * + * Use {@code #V} for project version (without snapshot suffix) and + * {@code #R} for the given scm revision and #S to add snapshot suffix + * + * Example: + * + * <pre> + * #V-rev-#V -> 1.0-rev-1 (version=1.0 and revision=1) + * #V-rev-#V#S -> 1.0-rev-1-SNAPSHOT (version=1.0 and revision=1) + * #V-rev-#V#S -> 1.0-rev-1-SNAPSHOT (version=1.0-SNAPSHOT and revision=1) + * </pre> + * + * Note that the #S can only be putted at the end of the pattern + * + * @since 2.0 + */ + @Parameter(property = "helper.newVersionPattern", defaultValue = "#V-rev-#R") + private String newVersionPattern = "#V-rev-#R"; + + /** + * The project property where to store the version. + * + * @since 2.0 + */ + @Parameter(property = "helper.versionKey", defaultValue = "newVersion", + required = true) + private String versionKey = "newVersion"; + + /** + * A flag to activate verbose mode. + * + * @since 2.0 + */ + @Parameter(property = "helper.verbose", defaultValue = "${maven.verbose}") + private boolean verbose; + + /** + * A flag to execute only once the mojo. + * + * Note: By default, value is {@code true} since it is not necessary + * to inject twice secrets in session. + * + * @since 1.1.0 + */ + @Parameter(property = "helper.runOnce", defaultValue = "true") + private boolean runOnce; + + @Override + public boolean checkSkip() { + + boolean result = true; + if (runOnce) { + + // compute the unique key refering to parameters of plugin + String key = "transform-project-version##" + revision; + + // check if plugin was already done. + + if (isVerbose()) { + getLog().info("check if already done for key : " + key); + } + Object value = project.getProperties().get(key); + if (value != null) { + + // ok was already done + getLog().info("Goal was already executed, will skip goal."); + result = false; + } else { + + long timestamp = System.nanoTime(); + project.getProperties().put(key, timestamp + ""); + if (isVerbose()) { + getLog().info("Adding cache key " + key + + " with timestamp " + timestamp); + } + } + } + return result; + } + + @Override + protected void init() throws Exception { + + // validate the newVersionPattern + if (!newVersionPattern.contains("#V") && + !newVersionPattern.contains("#R")) { + throw new MojoExecutionException( + "newVersionPattern (" + newVersionPattern + + ") must at least contains one of those patterns:" + + " *#V* or *#R*."); + } + + if (newVersionPattern.contains("#S")) { + + // check that there is only one of it and at the end + int firstIndex = newVersionPattern.indexOf("#S"); + int lastIndex = newVersionPattern.lastIndexOf("#S"); + + if (firstIndex != lastIndex) { + throw new MojoExecutionException( + "newVersionPattern (" + newVersionPattern + + ") can only contains one pattern *#S*."); + } + + if (lastIndex != newVersionPattern.length() - 2) { + throw new MojoExecutionException( + "newVersionPattern (" + newVersionPattern + + ") can only contains pattern *#S* at his end."); + } + } + + } + + @Override + protected void doAction() throws Exception { + String version = getProject().getVersion(); + + if (isVerbose()) { + getLog().info("Initial version: " + version); + } + + boolean snapshotFound = version.endsWith(SNAPSHOT_SUFFIX); + if (snapshotFound) { + + // remove snapshot + version = version.substring(0, version.length() - + SNAPSHOT_SUFFIX.length()); + } + + String newVersion = newVersionPattern.replaceAll("#V", version); + + newVersion = newVersion.replaceAll("#R", revision); + newVersion = newVersion.replaceAll("#S", SNAPSHOT_SUFFIX); + + if (isVerbose()) { + getLog().info("New version: " + newVersion); + } + + Properties properties = project.getProperties(); + + getLog().info("export newVersion [" + newVersion + "] " + + " in ${" + versionKey + "}"); + + properties.setProperty(versionKey, newVersion); + } + + @Override + public MavenProject getProject() { + return project; + } + + @Override + public void setProject(MavenProject project) { + this.project = project; + } + + @Override + public boolean isVerbose() { + return verbose; + } + + @Override + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } +} Property changes on: trunk/helper-maven-plugin/src/main/java/org/nuiton/helper/plugin/TransformProjectVersionMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/TransformProjectVersionMojoTest.java =================================================================== --- trunk/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/TransformProjectVersionMojoTest.java (rev 0) +++ trunk/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/TransformProjectVersionMojoTest.java 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,127 @@ +package org.nuiton.helper.plugin; + +/* + * #%L + * Helper Maven Plugin :: Mojos + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.plugin.AbstractMojoTest; + +import java.io.File; +import java.util.Properties; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class TransformProjectVersionMojoTest extends AbstractMojoTest<TransformProjectVersionMojo> { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TransformProjectVersionMojoTest.class); + + protected boolean canContinue; + + @Override + protected String getGoalName(String methodName) { + return "transform-project-version"; + } + + @Override + protected void setUpMojo(TransformProjectVersionMojo mojo, File pomFile) throws Exception { + super.setUpMojo(mojo, pomFile); + + try { + mojo.init(); + canContinue = true; + } catch (Exception e) { + + canContinue = false; + + if (log.isDebugEnabled()) { + log.debug("Could not init mojo ", e); + } + } + } + + @Test + public void simple() throws Exception { + + Assert.assertTrue(canContinue); + Assert.assertNotNull(getMojo()); + getMojo().doAction(); + + assertNewVersion("newVersion", "1.0-rev-1"); + } + + @Test + public void keepSnapshot() throws Exception { + + Assert.assertTrue(canContinue); + Assert.assertNotNull(getMojo()); + getMojo().doAction(); + + assertNewVersion("newVersion", "2.0-rev-2-SNAPSHOT"); + } + + @Test + public void removeSnapshot() throws Exception { + + Assert.assertTrue(canContinue); + Assert.assertNotNull(getMojo()); + getMojo().doAction(); + + assertNewVersion("newVersion", "2.0-rev-2"); + } + + @Test + public void badVersionPattern1() throws Exception { + + Assert.assertFalse(canContinue); + } + + @Test + public void badVersionPattern2() throws Exception { + + Assert.assertFalse(canContinue); + } + + @Test + public void badVersionPattern3() throws Exception { + + Assert.assertFalse(canContinue); + } + + protected void assertNewVersion(String versionKey, + String expectedNewVersion) { + + Properties properties = getMojo().getProject().getProperties(); + Object newVersion = properties.get(versionKey); + Assert.assertNotNull(newVersion); + Assert.assertEquals(expectedNewVersion, newVersion); + } + +} \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/java/org/nuiton/helper/plugin/TransformProjectVersionMojoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern1.xml =================================================================== --- trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern1.xml (rev 0) +++ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern1.xml 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,52 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>test-transform-project-version</artifactId> + <version>2.0-SNAPSHOT</version> + <build> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <configuration> + <revision>2</revision> + <newVersionPattern>#S</newVersionPattern> + </configuration> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern1.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern2.xml =================================================================== --- trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern2.xml (rev 0) +++ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern2.xml 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,52 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>test-transform-project-version</artifactId> + <version>2.0-SNAPSHOT</version> + <build> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <configuration> + <revision>2</revision> + <newVersionPattern>#S#V-rev-#R</newVersionPattern> + </configuration> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern2.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern3.xml =================================================================== --- trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern3.xml (rev 0) +++ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern3.xml 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,52 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>test-transform-project-version</artifactId> + <version>2.0-SNAPSHOT</version> + <build> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <configuration> + <revision>2</revision> + <newVersionPattern>#S#V-rev-#R#S</newVersionPattern> + </configuration> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/badVersionPattern3.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/keepSnapshot.xml =================================================================== --- trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/keepSnapshot.xml (rev 0) +++ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/keepSnapshot.xml 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,52 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>test-transform-project-version</artifactId> + <version>2.0-SNAPSHOT</version> + <build> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <configuration> + <revision>2</revision> + <newVersionPattern>#V-rev-#R#S</newVersionPattern> + </configuration> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/keepSnapshot.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/removeSnapshot.xml =================================================================== --- trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/removeSnapshot.xml (rev 0) +++ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/removeSnapshot.xml 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,52 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>test-transform-project-version</artifactId> + <version>2.0-SNAPSHOT</version> + <build> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <configuration> + <revision>2</revision> + <newVersionPattern>#V-rev-#R</newVersionPattern> + </configuration> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/removeSnapshot.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/simple.xml =================================================================== --- trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/simple.xml (rev 0) +++ trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/simple.xml 2012-11-11 13:03:02 UTC (rev 886) @@ -0,0 +1,52 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.test</groupId> + <artifactId>test-transform-project-version</artifactId> + <version>1.0</version> + <build> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <configuration> + <revision>1</revision> + </configuration> + <executions> + <execution> + <goals> + <goal>transform-project-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Property changes on: trunk/helper-maven-plugin/src/test/resources/org/nuiton/helper/plugin/transformProjectVersionMojoTest/simple.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r885 - trunk/helper-maven-plugin
by tchemit＠users.nuiton.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 11:21:23 +0100 (Sun, 11 Nov 2012) New Revision: 885 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/885 Log: fixes #2407: Split project in multi-module (re-add its profile) Modified: trunk/helper-maven-plugin/pom.xml Modified: trunk/helper-maven-plugin/pom.xml =================================================================== --- trunk/helper-maven-plugin/pom.xml 2012-11-11 10:02:41 UTC (rev 884) +++ trunk/helper-maven-plugin/pom.xml 2012-11-11 10:21:23 UTC (rev 885) @@ -127,7 +127,6 @@  - <dependency> <groupId>${project.groupId}</groupId> <artifactId>helper-maven-plugin-api</artifactId> @@ -156,18 +155,6 @@ <build> - <testResources> - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*~</exclude> - </excludes> - </testResource> - </testResources> - <plugins> <plugin> @@ -190,6 +177,52 @@ </build> <profiles> + +  + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> +  + <pomInclude>check-auto-container/unsafe-central/pom.xml</pomInclude> + <pomInclude>check-auto-container/central/pom.xml</pomInclude> + <pomInclude>check-auto-container/nuiton-other-releases/pom.xml</pomInclude> + <pomInclude>collect-files/multi/pom.xml</pomInclude> + <pomInclude>collect-files/single/pom.xml</pomInclude> + <pomInclude>send-email/single/pom.xml</pomInclude> + <pomInclude>share-server-secret/single/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> +  + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> +  <profile> <id>reporting</id> @@ -251,7 +284,7 @@ <tagletArtifact> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-javadoc</artifactId> - <version>1.5.5</version> + <version>${plexusComponentJavadocVersion}</version> </tagletArtifact> </tagletArtifacts> </configuration>

1 0