[maven-release] branch MRELEASE-1097 updated (702723cd -> dbd8587d)

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a change to branch MRELEASE-1097
in repository https://gitbox.apache.org/repos/asf/maven-release.git


 discard 702723cd [MRELEASE-1097] strong("local") instead of "LOCAL"
     new dbd8587d [MRELEASE-1097] strong("local") instead of "LOCAL"

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (702723cd)
            \
             N -- N -- N   refs/heads/MRELEASE-1097 (dbd8587d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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.


Summary of changes:
 maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven-release] 01/01: [MRELEASE-1097] strong("local") instead of "LOCAL"

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MRELEASE-1097
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit dbd8587d9de6d6f1fb0a84a36656d30cf85414c8
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun May 29 19:24:21 2022 +0200

    [MRELEASE-1097] strong("local") instead of "LOCAL"
---
 .../org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java | 4 +++-
 .../src/it/projects/perform/MRELEASE-818/verify.groovy                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
index 406d2ac6..719610d7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
@@ -54,6 +54,7 @@ import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 
 import static java.util.Objects.requireNonNull;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -277,7 +278,8 @@ public class CheckoutProjectFromScm
         if ( releaseDescriptor.isLocalCheckout() )
         {
             logInfo( result,
-                     "This would be a LOCAL check out to perform the release from " + checkoutDirectory + "..." );
+                     "The project would have a " + buffer().strong( "local" )
+                         + " check out to perform the release from " + checkoutDirectory + "..." );
         }
         else
         {
diff --git a/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy b/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy
index a2dfd3bb..89f178ae 100644
--- a/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy
+++ b/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy
@@ -20,7 +20,7 @@
 File buildLog = new File( basedir, 'build.log' )
 assert buildLog.exists()
 
-def localCheckoutExpr = /\Q[INFO] This would be a LOCAL check out to perform the release from /
+def localCheckoutExpr = /\Q[INFO] The project would have a local check out to perform the release from /
 def matcher = ( buildLog.getText() =~ localCheckoutExpr )
 
 assert matcher.find()