Use developmentVersion parameter also in interactive mode - closes #404

aleksandr-m · Jun 21, 2024 · 514831f · 514831f
1 parent 444ac42
commit 514831f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java
@@ -99,8 +99,7 @@ public class GitFlowReleaseFinishMojo extends AbstractGitFlowMojo {
     private boolean digitsOnlyDevVersion = false;
 
     /**
-     * Development version to use instead of the default next development
-     * version in non interactive mode.
+     * Development version to use instead of the default next development version.
      *
      * @since 1.6.0
      */
@@ -336,7 +335,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             if (!commitDevelopmentVersionAtStart && !skipReleaseMergeDevBranch) {
                 // get next snapshot version
                 final String nextSnapshotVersion;
-                if (!settings.isInteractiveMode() && StringUtils.isNotBlank(developmentVersion)) {
+                if (StringUtils.isNotBlank(developmentVersion)) {
                     nextSnapshotVersion = developmentVersion;
                 } else {
                     GitFlowVersionInfo versionInfo = new GitFlowVersionInfo(currentVersion, getVersionPolicy());

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseMojo.java
@@ -105,8 +105,7 @@ public class GitFlowReleaseMojo extends AbstractGitFlowMojo {
     private boolean digitsOnlyDevVersion = false;
 
     /**
-     * Development version to use instead of the default next development
-     * version in non interactive mode.
+     * Development version to use instead of the default next development version.
      * 
      * @since 1.6.0
      */
@@ -293,7 +292,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
             // get next snapshot version
             final String nextSnapshotVersion;
-            if (!settings.isInteractiveMode() && StringUtils.isNotBlank(developmentVersion)) {
+            if (StringUtils.isNotBlank(developmentVersion)) {
                 nextSnapshotVersion = developmentVersion;
             } else {
                 GitFlowVersionInfo versionInfo = new GitFlowVersionInfo(version, getVersionPolicy());

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java
@@ -95,8 +95,7 @@ public class GitFlowReleaseStartMojo extends AbstractGitFlowMojo {
     private boolean digitsOnlyDevVersion = false;
 
     /**
-     * Development version to use instead of the default next development
-     * version in non interactive mode.
+     * Development version to use instead of the default next development version.
      *
      * @since 1.7.0
      */
@@ -242,7 +241,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
     private String getNextSnapshotVersion(String currentVersion) throws MojoFailureException, VersionParseException {
         final String nextSnapshotVersion;
-        if (!settings.isInteractiveMode() && StringUtils.isNotBlank(developmentVersion)) {
+        if (StringUtils.isNotBlank(developmentVersion)) {
             nextSnapshotVersion = developmentVersion;
         } else {
             GitFlowVersionInfo versionInfo = new GitFlowVersionInfo(currentVersion, getVersionPolicy());