[MRELEASE-1016] use explicit parameter in message, fix branch message

apache · Apr 11, 2021 · 402b093 · 402b093
1 parent 8142302
commit 402b093
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/...n-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java b/...n-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
@@ -67,12 +67,11 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
 
         validateConfiguration( releaseDescriptor );
 
+        logInfo( relResult, "Branching release with the label " + releaseDescriptor.getScmReleaseLabel() + "..." );
+
         ReleaseDescriptor basedirAlignedReleaseDescriptor =
             ReleaseUtil.createBasedirAlignedReleaseDescriptor( releaseDescriptor, reactorProjects );
 
-        logInfo( relResult, "Branching release with the label " + basedirAlignedReleaseDescriptor.getScmReleaseLabel()
-            + "..." );
-
         ScmRepository repository;
         ScmProvider provider;
         try

diff --git a/...anager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java b/...anager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
@@ -46,15 +46,25 @@ protected void runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
         // no prepare-commit required
         if ( releaseDescriptor.isSuppressCommitBeforeTagOrBranch() )
         {
+            String parameterName;
+            if ( releaseDescriptor.isBranchCreation() ) 
+            {
+                parameterName = "suppressCommitBeforeBranch";
+            }
+            else 
+            {
+                parameterName = "suppressCommitBeforeTag";
+            }
+
             if ( simulating )
             {
-                logInfo( result, "Full run would not commit changes, "
-                    + "because suppressCommitBeforeTagOrBranch is set to true." );
+                logInfo( result,
+                         "Full run would not commit changes, " + "because " + parameterName + " is set to true." );
             }
             else
             {
                 logInfo( result,
-                         "Modified POMs are not committed because suppressCommitBeforeTagOrBranch is set to true." );
+                         "Modified POMs are not committed because " + parameterName + " is set to true." );
             }
         }
         // commit development versions required