Allow to use snapshot version in support branch - closes #250

Author: aleksandr-m

src/it/support-start-3-it/expected-pom.xml

@@ -0,0 +1,7 @@
+<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>com.amashchenko.maven.plugin</groupId>
+    <artifactId>gitflow-maven-test</artifactId>
+    <packaging>pom</packaging>
+    <version>0.0.3-SNAPSHOT</version>
+</project>

src/it/support-start-3-it/gitignorefile

@@ -0,0 +1,5 @@
+build.log
+expected-pom.xml
+invoker.properties
+init.bsh
+verify.bsh

src/it/support-start-3-it/init.bsh

@@ -0,0 +1,42 @@
+import org.codehaus.plexus.util.FileUtils;
+
+try {
+    new File(basedir, "gitignorefile").renameTo(new File(basedir, ".gitignore"));
+
+    Process p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " init");
+    p.waitFor();
+
+    Process p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " config user.email 'a@a.aa'");
+    p.waitFor();
+    Process p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " config user.name 'a'");
+    p.waitFor();
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " add .");
+    p.waitFor();
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " commit -m init");
+    p.waitFor();
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " tag -a 0.0.1 -m 0.0.1");
+    p.waitFor();
+
+    File file = new File(basedir, "test.txt");
+    FileUtils.fileAppend(file.getPath(), "next commit");
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " add .");
+    p.waitFor();
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " commit -m next");
+    p.waitFor();
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " tag -a 0.0.3 -m 0.0.3");
+    p.waitFor();
+
+    p = Runtime.getRuntime().exec("git --git-dir=" + basedir + "/.git --work-tree=" + basedir + " checkout -b develop");
+    p.waitFor();
+
+} catch (Exception e) {
+    e.printStackTrace();
+    return false;
+}
+return true;

src/it/support-start-3-it/invoker.properties

@@ -0,0 +1,3 @@
+invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:support-start -DpushRemote=false -B -DuseSnapshotInSupport
+
+invoker.description=Non-interactive support-start using useSnapshotInSupport parameter.

src/it/support-start-3-it/pom.xml

@@ -0,0 +1,7 @@
+<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>com.amashchenko.maven.plugin</groupId>
+    <artifactId>gitflow-maven-test</artifactId>
+    <packaging>pom</packaging>
+    <version>0.0.3</version>
+</project>

src/it/support-start-3-it/verify.bsh

@@ -0,0 +1,27 @@
+import org.codehaus.plexus.util.FileUtils;
+
+try {
+    File gitRef = new File(basedir, ".git/refs/heads/support/0.0.3");
+    if (!gitRef.exists()) {
+        System.out.println("support-start .git/refs/heads/support/0.0.3 doesn't exist");
+        return false;
+    }
+
+    File file = new File(basedir, "pom.xml");
+    File expectedFile = new File(basedir, "expected-pom.xml");
+
+    String actual = FileUtils.fileRead(file, "UTF-8");
+    String expected = FileUtils.fileRead(expectedFile, "UTF-8");
+
+    actual = actual.replaceAll("\\r?\\n", "");
+    expected = expected.replaceAll("\\r?\\n", "");
+
+    if (!expected.equals(actual)) {
+        System.out.println("support-start expected: " + expected + " actual was:" + actual);
+        return false;
+    }
+} catch (Exception e) {
+    e.printStackTrace();
+    return false;
+}
+return true;

src/main/java/com/amashchenko/maven/plugin/gitflow/CommitMessages.java

@@ -55,6 +55,8 @@ public class CommitMessages {
     private String updateFeatureBackMessage;
     private String featureFinishIncrementVersionMessage;
 
+    private String supportStartMessage;
+
     public CommitMessages() {
         featureStartMessage = "Update versions for feature branch";
         featureFinishMessage = "Update versions for development branch";
@@ -83,6 +85,8 @@ public CommitMessages() {
 
         updateFeatureBackMessage = "Update feature branch back to feature version";
         featureFinishIncrementVersionMessage = "Increment feature version";
+
+        supportStartMessage = "Update versions for support branch";
     }
 
     /**
@@ -423,4 +427,19 @@ public String getFeatureFinishIncrementVersionMessage() {
     public void setFeatureFinishIncrementVersionMessage(String featureFinishIncrementVersionMessage) {
         this.featureFinishIncrementVersionMessage = featureFinishIncrementVersionMessage;
     }
+
+    /**
+     * @return the supportStartMessage
+     */
+    public String getSupportStartMessage() {
+        return supportStartMessage;
+    }
+
+    /**
+     * @param supportStartMessage
+     *            the supportStartMessage to set
+     */
+    public void setSupportStartMessage(String supportStartMessage) {
+        this.supportStartMessage = supportStartMessage;
+    }
 }

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowSupportStartMojo.java

@@ -16,7 +16,11 @@
 package com.amashchenko.maven.plugin.gitflow;
 
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -56,6 +60,13 @@ public class GitFlowSupportStartMojo extends AbstractGitFlowMojo {
     @Parameter(property = "supportBranchName")
     private String supportBranchName;
 
+    /**
+     * Whether to use snapshot in support.
+     * 
+     */
+    @Parameter(property = "useSnapshotInSupport", defaultValue = "false")
+    private boolean useSnapshotInSupport;
+
     /** {@inheritDoc} */
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -113,6 +124,20 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             // git checkout -b ... tag
             gitCreateAndCheckout(gitFlowConfig.getSupportBranchPrefix() + branchName, tag);
 
+            if (useSnapshotInSupport) {
+                String version = getCurrentProjectVersion();
+                if (!ArtifactUtils.isSnapshot(version)) {
+                    version = version + "-" + Artifact.SNAPSHOT_VERSION;
+                    
+                    mvnSetVersions(version);
+
+                    Map<String, String> properties = new HashMap<String, String>();
+                    properties.put("version", version);
+
+                    gitCommit(commitMessages.getSupportStartMessage(), properties);
+                }
+            }
+
             if (installProject) {
                 // mvn clean install
                 mvnCleanInstall();