From 2979f9f05675af2e8fb027d33d9a73672b9bba4c Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Fri, 2 Feb 2024 20:04:39 +0100
Subject: [PATCH] Improve logging of server id

---
 .../release/scm/DefaultScmRepositoryConfigurator.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
index c4977300..4b3a5536 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
@@ -139,7 +139,7 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea
 
                 if (passphrase == null && server.getPassphrase() != null) {
                     logger.debug(
-                            "Using passphrase from server id {} found in Maven settings", releaseDescriptor.getScmId());
+                            "Using passphrase from server id '{}' found in Maven settings", releaseDescriptor.getScmId());
                     passphrase = decrypt(server.getPassphrase(), server.getId());
                 }
             }
@@ -190,11 +190,11 @@ public ScmRepository getConfiguredRepository(String url, ReleaseDescriptor relea
         return repository;
     }
 
-    private String decrypt(String str, String server) {
+    private String decrypt(String str, String serverId) {
         try {
             return mavenCrypto.decrypt(str);
         } catch (MavenCryptoException e) {
-            String msg = "Failed to decrypt password/passphrase for server " + server + ", using auth token as is: "
+            String msg = "Failed to decrypt password/passphrase for server with id '" + serverId + "', using auth token as is: "
                     + e.getMessage();
             if (logger.isDebugEnabled()) {
                 logger.warn(msg, e);