You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/04/11 14:50:32 UTC
[maven-release] 02/02: [MRELEASE-1016] use explicit parameter in
message
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1016
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 4a5da6cc9d7ca23106c4cd890a978bff04370a48
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Apr 10 19:47:08 2021 +0200
[MRELEASE-1016] use explicit parameter in message
---
.../shared/release/phase/ScmCommitPreparationPhase.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
index b1f47e8..b4a5bbf 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
@@ -46,15 +46,25 @@ public class ScmCommitPreparationPhase
// 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