Add ability to increment different digit in hotfix version - closes #186

Author: aleksandr-m

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

@@ -71,6 +71,13 @@ public class GitFlowHotfixStartMojo extends AbstractGitFlowMojo {
     @Parameter(property = "useSnapshotInHotfix", defaultValue = "false")
     private boolean useSnapshotInHotfix;
 
+    /**
+     * Which digit to increment in the next hotfix version. Starts from zero.
+     *
+     */
+    @Parameter(property = "hotfixVersionDigitToIncrement")
+    private Integer hotfixVersionDigitToIncrement;
+
     /** {@inheritDoc} */
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -154,8 +161,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             final String currentVersion = getCurrentProjectVersion();
 
             // get default hotfix version
-            final String defaultVersion = new GitFlowVersionInfo(currentVersion)
-                    .hotfixVersion(tychoBuild);
+            final String defaultVersion = new GitFlowVersionInfo(currentVersion).hotfixVersion(tychoBuild, hotfixVersionDigitToIncrement);
 
             if (defaultVersion == null) {
                 throw new MojoFailureException(

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

@@ -68,35 +68,46 @@ public String nextSnapshotVersion() {
     }
 
     /**
-     * Gets next SNAPSHOT version. If index is <code>null</code> or not valid
-     * then it delegates to {@link #getNextVersion()} method.
+     * Gets next SNAPSHOT version.
      * 
      * @param index
      *            Which part of version to increment.
      * @return Next SNAPSHOT version.
      */
     public String nextSnapshotVersion(final Integer index) {
+        return nextVersion(index, true);
+    }
+
+    /**
+     * Gets next version. If index is <code>null</code> or not valid then it
+     * delegates to {@link #getNextVersion()} method.
+     * 
+     * @param index
+     *            Which part of version to increment.
+     * @param snapshot
+     *            Whether to use SNAPSHOT version.
+     * @return Next version.
+     */
+    private String nextVersion(final Integer index, boolean snapshot) {
         List<String> digits = getDigits();
 
         String nextVersion = null;
 
         if (digits != null) {
             if (index != null && index >= 0 && index < digits.size()) {
                 int origDigitsLength = joinDigitString(digits).length();
-                digits.set(index,
-                        incrementVersionString((String) digits.get(index)));
+                digits.set(index, incrementVersionString((String) digits.get(index)));
                 for (int i = index + 1; i < digits.size(); i++) {
                     digits.set(i, "0");
                 }
                 String digitsStr = joinDigitString(digits);
-                nextVersion = digitsStr
-                        + getSnapshotVersionString()
-                                .substring(origDigitsLength);
+                nextVersion = digitsStr + (snapshot ? getSnapshotVersionString().substring(origDigitsLength)
+                        : getReleaseVersionString().substring(origDigitsLength));
             } else {
-                nextVersion = getNextVersion().getSnapshotVersionString();
+                nextVersion = snapshot ? getNextVersion().getSnapshotVersionString() : getNextVersion().getReleaseVersionString();
             }
         } else {
-            nextVersion = getSnapshotVersionString();
+            nextVersion = snapshot ? getSnapshotVersionString() : getReleaseVersionString();
         }
         return nextVersion;
     }
@@ -122,11 +133,11 @@ public String featureVersion(final String featureName) {
      * 
      * @param preserveSnapshot
      *            Whether to preserve SNAPSHOT in the version.
+     * @param index
+     *            Which part of version to increment.
      * @return Next version.
      */
-    public String hotfixVersion(boolean preserveSnapshot) {
-        return (preserveSnapshot && isSnapshot()) ? getNextVersion()
-                .getSnapshotVersionString() : getNextVersion()
-                .getReleaseVersionString();
+    public String hotfixVersion(boolean preserveSnapshot, final Integer index) {
+        return nextVersion(index, (preserveSnapshot && isSnapshot()));
     }
 }

src/test/java/com/amashchenko/maven/plugin/gitflow/GitFlowVersionInfoTest.java

@@ -51,28 +51,28 @@ public void testIsValidVersion() throws Exception {
     public void testHotfixVersion() throws Exception {
         GitFlowVersionInfo info = new GitFlowVersionInfo("0.9");
         Assert.assertNotNull(info);
-        Assert.assertEquals("0.10", info.hotfixVersion(false));
+        Assert.assertEquals("0.10", info.hotfixVersion(false, null));
     }
 
     @Test
     public void testHotfixVersion2() throws Exception {
         GitFlowVersionInfo info = new GitFlowVersionInfo("0.9-SNAPSHOT");
         Assert.assertNotNull(info);
-        Assert.assertEquals("0.10", info.hotfixVersion(false));
+        Assert.assertEquals("0.10", info.hotfixVersion(false, null));
     }
 
     @Test
     public void testHotfixVersion3() throws Exception {
         GitFlowVersionInfo info = new GitFlowVersionInfo("0.9");
         Assert.assertNotNull(info);
-        Assert.assertEquals("0.10", info.hotfixVersion(true));
+        Assert.assertEquals("0.10", info.hotfixVersion(true, null));
     }
 
     @Test
     public void testHotfixVersion4() throws Exception {
         GitFlowVersionInfo info = new GitFlowVersionInfo("0.9-SNAPSHOT");
         Assert.assertNotNull(info);
-        Assert.assertEquals("0.10-SNAPSHOT", info.hotfixVersion(true));
+        Assert.assertEquals("0.10-SNAPSHOT", info.hotfixVersion(true, null));
     }
 
     @Test

src/test/java/com/amashchenko/maven/plugin/gitflow/NextHotfixVersionTest.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014-2021 Aleksandr Mashchenko.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.amashchenko.maven.plugin.gitflow;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class NextHotfixVersionTest {
+    private final String version;
+    private final Integer index;
+    private final String expectedVersion;
+
+    public NextHotfixVersionTest(final String version, final Integer index, final String expectedVersion) {
+        this.version = version;
+        this.index = index;
+        this.expectedVersion = expectedVersion;
+    }
+
+    @Parameters(name = "{0}-({1})->{2}")
+    public static Collection<Object[]> data() {
+        return Arrays
+                .asList(new Object[][] {
+                                { "some-SNAPSHOT", null, "some" },
+                                { "some-SNAPSHOT", 0, "some" },
+                                { "0.58", null, "0.59" },
+                                { "0.58", -1, "0.59" },
+                                { "0.58", 0, "1.0" },
+                                { "0.58", 1, "0.59" },
+                                { "0.58", 100, "0.59" },
+                                { "0.9", 1, "0.10" },
+                                { "0.09", 1, "0.10" },
+                                { "0.0009", 0, "1.0" },
+                                { "0.0009", 1, "0.0010" },
+                                { "0.09-RC2", null, "0.09-RC3" },
+                                { "0.09-RC3", 0, "1.0-RC3" },
+                                { "0.09-RC3-SNAPSHOT", 0, "1.0-RC3" },
+                                { "0.9-SNAPSHOT", null, "0.10" },
+                                { "0.09-RC3-feature-SNAPSHOT", 0, "1.0-RC3-feature" },
+                                { "0.09-RC3-feature", null, "0.09-RC4-feature" },
+                                { "2.3.4", 0, "3.0.0" },
+                                { "2.3.4", 1, "2.4.0" } });
+    }
+
+    @Test
+    public void testNextSnapshotVersion() throws Exception {
+        Assert.assertEquals(expectedVersion, new GitFlowVersionInfo(version).hotfixVersion(false, index));
+    }
+}