This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch bugfix/fix-logging-of-makeProviderScmRepository in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit a293248f355b361b6d985e50d0c60706204e99d2 Author: Konrad Windszus <[email protected]> AuthorDate: Fri Feb 27 17:55:02 2026 +0100 Fix logging for makeProviderScmRepository to emit unique provider name instead of its type --- .../java/org/apache/maven/scm/manager/AbstractScmManager.java | 11 +++++------ .../java/org/apache/maven/scm/repository/ScmRepository.java | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java index 240c0ccb4..6829716af 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java @@ -248,19 +248,18 @@ public ScmRepository makeProviderScmRepository(String providerType, File path) @Override public Optional<ScmRepository> makeProviderScmRepository(File workingDirectory) { - // - for (ScmProvider provider : scmProviders.values()) { + for (Map.Entry<String, ScmProvider> providerByName : scmProviders.entrySet()) { logger.debug( "Checking if SCM provider {} is suitable for processing: {}", - provider.getScmType(), + providerByName.getKey(), workingDirectory); try { - ScmProviderRepository providerRepository = provider.makeProviderScmRepository(workingDirectory); - return Optional.of(new ScmRepository(provider.getScmType(), providerRepository)); + ScmProviderRepository providerRepository = providerByName.getValue().makeProviderScmRepository(workingDirectory); + return Optional.of(new ScmRepository(providerByName.getValue().getScmType(), providerRepository)); } catch (ScmRepositoryException | UnknownRepositoryStructure e) { logger.debug( "SCM provider {} is not suitable for processing: {}", - provider.getScmType(), + providerByName.getKey(), workingDirectory, e); } diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java b/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java index 0db4a7ec5..77578292f 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java @@ -36,7 +36,9 @@ public ScmRepository(String provider, ScmProviderRepository providerRepository) } /** - * @return returns the provider + * The SCM provider type, such as "svn", "git", etc. + * A value as returned by {@link org.apache.maven.scm.provider.ScmProvider#getScmType()}. + * @return returns the provider type */ public String getProvider() { return provider;
