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:30 UTC
[maven-release] branch MRELEASE-1016 created (now 4a5da6c)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MRELEASE-1016
in repository https://gitbox.apache.org/repos/asf/maven-release.git.
at 4a5da6c [MRELEASE-1016] use explicit parameter in message
This branch includes the following new commits:
new fdff300 [MRELEASE-1016] Fix branch message
new 4a5da6c [MRELEASE-1016] use explicit parameter in message
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-release] 02/02: [MRELEASE-1016] use explicit parameter in
message
Posted by rf...@apache.org.
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
[maven-release] 01/02: [MRELEASE-1016] Fix branch message
Posted by rf...@apache.org.
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 fdff300b8d049b1cf5202300f2642d1c1963a9ca
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Apr 10 19:20:54 2021 +0200
[MRELEASE-1016] Fix branch message
---
.../java/org/apache/maven/shared/release/phase/ScmBranchPhase.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
index 576f511..a3243e4 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
@@ -67,12 +67,11 @@ public class ScmBranchPhase
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