You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2024/02/02 16:52:35 UTC
(maven-release) branch feature/improve-logging-of-used-credential-sources created (now 0b3dd73b)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/improve-logging-of-used-credential-sources
in repository https://gitbox.apache.org/repos/asf/maven-release.git
at 0b3dd73b [MRELEASE-1139] Improve logging of sources for used credentials
This branch includes the following new commits:
new 0b3dd73b [MRELEASE-1139] Improve logging of sources for used credentials
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.
(maven-release) 01/01: [MRELEASE-1139] Improve logging of sources for used credentials
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/improve-logging-of-used-credential-sources
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 0b3dd73b94fafd4db34d1b322dc2c948358179d8
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Feb 2 17:52:29 2024 +0100
[MRELEASE-1139] Improve logging of sources for used credentials
Clarify precedence of credentials resolved via settings and those
explicitly given.
---
.../shared/release/config/ReleaseDescriptor.java | 6 +++--
.../scm/DefaultScmRepositoryConfigurator.java | 28 ++++++++++++++++++----
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
index 976a0f56..ceb98cf6 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -366,9 +366,11 @@ public interface ReleaseDescriptor {
String getScmBranchBase();
/**
- * Get the id can be used to get the credentials by the server-id from the settings.xml.
+ * Get the id which can be used to get the (optionally encrypted) credentials with the given id from the {@code settings.xml}.
+ * Explicit credentials in {@link #getScmUsername()}, {@link #getScmPassword()}, {@link #getScmPrivateKey()} or
+ * {@link #getScmPrivateKeyPassPhrase()} always take precedence, though.
*
- * @return String
+ * @return the server id of a server in {@code settings.xml}
*/
String getScmId();
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 90f31fb4..c4977300 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
@@ -96,6 +96,9 @@ public class DefaultScmRepositoryConfigurator implements ScmRepositoryConfigurat
if (releaseDescriptor.getScmId() != null) {
server = settings.getServer(releaseDescriptor.getScmId());
+ if (server == null) {
+ logger.warn("No server with id {} found in Maven settings", releaseDescriptor.getScmId());
+ }
}
if (server == null && repository.getProviderRepository() instanceof ScmProviderRepositoryWithHost) {
@@ -115,19 +118,28 @@ public class DefaultScmRepositoryConfigurator implements ScmRepositoryConfigurat
}
if (server != null) {
- if (username == null) {
+ if (username == null && server.getUsername() != null) {
+ logger.debug(
+ "Using username from server id {} found in Maven settings", releaseDescriptor.getScmId());
username = server.getUsername();
}
- if (password == null) {
+ if (password == null && server.getPassword() != null) {
+ logger.debug(
+ "Using password from server id {} found in Maven settings", releaseDescriptor.getScmId());
password = decrypt(server.getPassword(), server.getId());
}
- if (privateKey == null) {
+ if (privateKey == null && server.getPrivateKey() != null) {
+ logger.debug(
+ "Using private key from server id {} found in Maven settings",
+ releaseDescriptor.getScmId());
privateKey = server.getPrivateKey();
}
- if (passphrase == null) {
+ if (passphrase == null && server.getPassphrase() != null) {
+ logger.debug(
+ "Using passphrase from server id {} found in Maven settings", releaseDescriptor.getScmId());
passphrase = decrypt(server.getPassphrase(), server.getId());
}
}
@@ -135,19 +147,27 @@ public class DefaultScmRepositoryConfigurator implements ScmRepositoryConfigurat
if (!(username == null || username.isEmpty())) {
scmRepo.setUser(username);
+ } else {
+ logger.debug("No explicit username configured");
}
if (!(password == null || password.isEmpty())) {
scmRepo.setPassword(password);
+ } else {
+ logger.debug("No explicit password configured");
}
if (scmRepo instanceof ScmProviderRepositoryWithHost) {
ScmProviderRepositoryWithHost repositoryWithHost = (ScmProviderRepositoryWithHost) scmRepo;
if (!(privateKey == null || privateKey.isEmpty())) {
repositoryWithHost.setPrivateKey(privateKey);
+ } else {
+ logger.debug("No explicit private key configured");
}
if (!(passphrase == null || passphrase.isEmpty())) {
repositoryWithHost.setPassphrase(passphrase);
+ } else {
+ logger.debug("No explicit passphrase configured");
}
}