From 07b3848d5ef721e79bf728cc1a1d9ba2911136e9 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 6 Aug 2025 18:33:01 +0100 Subject: [PATCH 1/4] Reduce amount of log junk we emit --- .../org/apache/maven/scm/plugin/AbstractScmMojo.java | 2 +- .../java/org/apache/maven/scm/plugin/AddMojo.java | 2 +- .../java/org/apache/maven/scm/plugin/BranchMojo.java | 2 +- .../org/apache/maven/scm/plugin/ChangeLogMojo.java | 2 +- .../scm/plugin/CheckLocalModificationsMojo.java | 2 +- .../java/org/apache/maven/scm/plugin/DiffMojo.java | 2 +- .../java/org/apache/maven/scm/plugin/ExportMojo.java | 2 +- .../java/org/apache/maven/scm/plugin/TagMojo.java | 6 +++--- .../java/org/apache/maven/scm/plugin/UpdateMojo.java | 4 ++-- .../provider/hg/command/status/HgStatusConsumer.java | 12 ++++++------ .../git/jgit/command/checkin/JGitCheckInCommand.java | 2 +- .../svn/svnexe/command/untag/SvnUntagCommand.java | 6 +++--- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java index cc1a8fd5b..2c356990a 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java @@ -227,7 +227,7 @@ public void execute() throws MojoExecutionException { for (Entry entry : providerImplementations.entrySet()) { String providerType = entry.getKey(); String providerImplementation = entry.getValue(); - getLog().info("Change the default '" + providerType + "' provider implementation to '" + getLog().debug("Change the default '" + providerType + "' provider implementation to '" + providerImplementation + "'."); getScmManager().setScmProviderImplementation(providerType, providerImplementation); } diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java index a4145e001..09ceb1257 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java @@ -54,7 +54,7 @@ public void execute() throws MojoExecutionException { checkResult(result); - getLog().info("" + result.getAddedFiles().size() + " files successfully added."); + getLog().debug("" + result.getAddedFiles().size() + " files successfully added."); } catch (IOException | ScmException e) { throw new MojoExecutionException("Cannot run add command : ", e); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java index 3ac8e46b1..855df16f3 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java @@ -86,7 +86,7 @@ public void execute() throws MojoExecutionException { ScmProvider provider = getScmManager().getProviderByRepository(repository); String finalBranch = provider.sanitizeTagName(branch); - getLog().info("Final Branch Name: '" + finalBranch + "'"); + getLog().debug("Final Branch Name: '" + finalBranch + "'"); ScmBranchParameters scmBranchParameters = new ScmBranchParameters(message); scmBranchParameters.setRemoteBranching(remoteBranching); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java index a91158e20..f6fc6be8e 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java @@ -201,7 +201,7 @@ public void execute() throws MojoExecutionException { ChangeLogSet changeLogSet = result.getChangeLog(); for (ChangeSet changeSet : changeLogSet.getChangeSets()) { - getLog().info(changeSet.toString()); + getLog().debug(changeSet.toString()); } } catch (IOException | ScmException e) { diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java index 1e22fac0d..58d331766 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java @@ -61,7 +61,7 @@ public CheckLocalModificationsMojo(ScmManager manager, SettingsDecrypter setting public void execute() throws MojoExecutionException { if (skip) { - getLog().info("check-local-modification execution has been skipped"); + getLog().debug("check-local-modification execution has been skipped"); return; } super.execute(); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java index ce1de9b60..439a23a81 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java @@ -91,7 +91,7 @@ public void execute() throws MojoExecutionException { checkResult(result); - getLog().info(result.getPatch()); + getLog().debug(result.getPatch()); try { if (outputFile != null) { diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java index 703100178..ea8a1b5fb 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java @@ -99,7 +99,7 @@ protected void export() throws MojoExecutionException { try { if (this.exportDirectory.exists()) { - this.getLog().info("Removing " + this.exportDirectory); + this.getLog().debug("Removing " + this.exportDirectory); FileUtils.deleteDirectory(this.exportDirectory); } diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java index 3e3c2bf6f..3c26995c2 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java @@ -131,10 +131,10 @@ public void execute() throws MojoExecutionException { if (addTimestamp) { try { - getLog().info("Using timestamp pattern '" + timestampFormat + "'"); + getLog().debug("Using timestamp pattern '" + timestampFormat + "'"); dateFormat = new SimpleDateFormat(timestampFormat); tagTimestamp = dateFormat.format(new Date()); - getLog().info("Using timestamp '" + tagTimestamp + "'"); + getLog().debug("Using timestamp '" + tagTimestamp + "'"); } catch (IllegalArgumentException e) { String msg = "The timestamp format '" + timestampFormat + "' is invalid."; getLog().error(msg, e); @@ -152,7 +152,7 @@ public void execute() throws MojoExecutionException { ScmProvider provider = getScmManager().getProviderByRepository(repository); finalTag = provider.sanitizeTagName(finalTag); - getLog().info("Final Tag Name: '" + finalTag + "'"); + getLog().debug("Final Tag Name: '" + finalTag + "'"); ScmTagParameters scmTagParameters = new ScmTagParameters(message); scmTagParameters.setRemoteTagging(remoteTagging); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java index 351bcd05f..b0002e7db 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java @@ -90,14 +90,14 @@ public void execute() throws MojoExecutionException { if (result instanceof UpdateScmResultWithRevision) { String revision = ((UpdateScmResultWithRevision) result).getRevision(); - getLog().info("Storing revision in '" + revisionKey + "' project property."); + getLog().debug("Storing revision in '" + revisionKey + "' project property."); if (project.getProperties() != null) // Remove the test when we'll use plugin-test-harness 1.0-alpha-2 { project.getProperties().put(revisionKey, revision); } - getLog().info("Project at revision " + revision); + getLog().debug("Project at revision " + revision); } } catch (IOException | ScmException e) { throw new MojoExecutionException("Cannot run update command : ", e); diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java index f4c0eccae..c7f1f030b 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/status/HgStatusConsumer.java @@ -44,17 +44,17 @@ public void doConsume(ScmFileStatus status, String trimmedLine) { // Only include real files (not directories) File tmpFile = new File(workingDir, trimmedLine); if (!tmpFile.exists()) { - if (logger.isInfoEnabled()) { - logger.info("Not a file: " + tmpFile + ". Ignoring"); + if (logger.isDebugEnabled()) { + logger.debug("Not a file: " + tmpFile + ". Ignoring"); } } else if (tmpFile.isDirectory()) { - if (logger.isInfoEnabled()) { - logger.info("New directory added: " + tmpFile); + if (logger.isDebugEnabled()) { + logger.debug("New directory added: " + tmpFile); } } else { ScmFile scmFile = new ScmFile(trimmedLine, status); - if (logger.isInfoEnabled()) { - logger.info(scmFile.toString()); + if (logger.isDebugEnabled()) { + logger.debug(scmFile.toString()); } repositoryStatus.add(scmFile); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java index 34b4053b6..51a175061 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java @@ -156,7 +156,7 @@ public CheckInScmResult executeCommand(ScmProviderRepository repo, ScmFileSet fi .setSign(parameters.getBoolean(CommandParameter.SCM_COMMIT_SIGN, true)); RevCommit commitRev = command.call(); - logger.info("commit done: " + commitRev.getShortMessage()); + logger.debug("commit done: " + commitRev.getShortMessage()); checkedInFiles = JGitUtils.getFilesInCommit(git.getRepository(), commitRev, fileSet.getBasedir()); if (logger.isDebugEnabled()) { for (ScmFile scmFile : checkedInFiles) { diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommand.java index e0e298af8..568345bc8 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/untag/SvnUntagCommand.java @@ -83,11 +83,11 @@ public ScmResult executeUntagCommand( CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - if (logger.isInfoEnabled()) { - logger.info("Executing: " + SvnCommandLineUtils.cryptPassword(cl)); + if (logger.isDebugEnabled()) { + logger.debug("Executing: " + SvnCommandLineUtils.cryptPassword(cl)); if (Os.isFamily(Os.FAMILY_WINDOWS)) { - logger.info("Working directory: " + cl.getWorkingDirectory().getAbsolutePath()); + logger.debug("Working directory: " + cl.getWorkingDirectory().getAbsolutePath()); } } From d0a91474ab5aa5e38de3af2d65798f618f73899f Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 6 Aug 2025 21:46:20 +0100 Subject: [PATCH 2/4] more debug --- .../scm/provider/hg/command/checkout/HgCheckOutCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java index fc0b737dd..ae237748b 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java @@ -55,8 +55,8 @@ protected CheckOutScmResult executeCheckOutCommand( File checkoutDir = fileSet.getBasedir(); try { - if (logger.isInfoEnabled()) { - logger.info("Removing " + checkoutDir); + if (logger.isDebugEnabled()) { + logger.debug("Removing " + checkoutDir); } FileUtils.deleteDirectory(checkoutDir); } catch (IOException e) { From 73e4d19ad59cf8d86b386a4d960959a5ef1b18f1 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 6 Aug 2025 21:48:34 +0100 Subject: [PATCH 3/4] more debug --- .../src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java index 2b66ba560..d1f2eae37 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java @@ -146,7 +146,7 @@ protected ScmResult checkout() throws MojoExecutionException { private void prepareOutputDirectory(File ouputDirectory) throws MojoExecutionException { try { - this.getLog().info("Removing " + ouputDirectory); + this.getLog().debug("Removing " + ouputDirectory); FileUtils.deleteDirectory(getCheckoutDirectory()); } catch (IOException e) { From cdb58f49619a3a66902e4f26a6424fdba1556a9c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 16 Aug 2025 06:44:04 -0400 Subject: [PATCH 4/4] more info --- .../src/main/java/org/apache/maven/scm/plugin/AddMojo.java | 2 +- .../apache/maven/scm/plugin/CheckLocalModificationsMojo.java | 2 +- .../src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java index 09ceb1257..a4145e001 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java @@ -54,7 +54,7 @@ public void execute() throws MojoExecutionException { checkResult(result); - getLog().debug("" + result.getAddedFiles().size() + " files successfully added."); + getLog().info("" + result.getAddedFiles().size() + " files successfully added."); } catch (IOException | ScmException e) { throw new MojoExecutionException("Cannot run add command : ", e); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java index 58d331766..1e22fac0d 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java @@ -61,7 +61,7 @@ public CheckLocalModificationsMojo(ScmManager manager, SettingsDecrypter setting public void execute() throws MojoExecutionException { if (skip) { - getLog().debug("check-local-modification execution has been skipped"); + getLog().info("check-local-modification execution has been skipped"); return; } super.execute(); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java index b0002e7db..723d86cd3 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java @@ -97,7 +97,7 @@ public void execute() throws MojoExecutionException { project.getProperties().put(revisionKey, revision); } - getLog().debug("Project at revision " + revision); + getLog().info("Project at revision " + revision); } } catch (IOException | ScmException e) { throw new MojoExecutionException("Cannot run update command : ", e);