From 65a22509360c6a91c62d4c19ec96b4e44e85becd Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Mon, 9 Feb 2026 15:32:15 -0500 Subject: [PATCH] fix FileSetManager logging change --- .../java/com/inteligr8/maven/merge/AbstractMergeMojo.java | 8 ++++++-- .../com/inteligr8/maven/merge/AppendFilesContentMojo.java | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/inteligr8/maven/merge/AbstractMergeMojo.java b/src/main/java/com/inteligr8/maven/merge/AbstractMergeMojo.java index bfadf9a..e3dce4f 100755 --- a/src/main/java/com/inteligr8/maven/merge/AbstractMergeMojo.java +++ b/src/main/java/com/inteligr8/maven/merge/AbstractMergeMojo.java @@ -26,6 +26,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.shared.model.fileset.FileSet; import org.apache.maven.shared.model.fileset.util.FileSetManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class provides general merging support for other goals. @@ -33,7 +35,9 @@ import org.apache.maven.shared.model.fileset.util.FileSetManager; * @author brian@inteligr8.com */ public abstract class AbstractMergeMojo extends AbstractFileContentMojo { - + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Parameter( property = "filesets", required = true ) protected List filesets; @@ -42,7 +46,7 @@ public abstract class AbstractMergeMojo extends AbstractFileContentMojo { this.getLog().debug("merge " + (directory ? "directories" : "files")); boolean didMerge = false; - FileSetManager fsman = new FileSetManager(this.getLog()); + FileSetManager fsman = new FileSetManager(this.logger); Path basepath = this.project.getBasedir().toPath(); try { diff --git a/src/main/java/com/inteligr8/maven/merge/AppendFilesContentMojo.java b/src/main/java/com/inteligr8/maven/merge/AppendFilesContentMojo.java index 4b0bbb8..6ac4708 100644 --- a/src/main/java/com/inteligr8/maven/merge/AppendFilesContentMojo.java +++ b/src/main/java/com/inteligr8/maven/merge/AppendFilesContentMojo.java @@ -25,6 +25,8 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.shared.model.fileset.FileSet; import org.apache.maven.shared.model.fileset.util.FileSetManager; import org.codehaus.plexus.component.annotations.Component; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This goal appends all the files in the configured fileset and writes that @@ -35,6 +37,8 @@ import org.codehaus.plexus.component.annotations.Component; @Mojo( name = "append-files", threadSafe = true ) @Component( role = org.apache.maven.plugin.Mojo.class ) public class AppendFilesContentMojo extends AbstractFileContentMojo { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Parameter( property = "filesets", required = true ) protected List filesets; @@ -55,7 +59,7 @@ public class AppendFilesContentMojo extends AbstractFileContentMojo { private boolean appendContentInFileSet() throws MojoExecutionException { int spacing = Math.max(this.includeHeader ? 1 : 0, this.spacing); boolean didMerge = false; - FileSetManager fsman = new FileSetManager(this.getLog()); + FileSetManager fsman = new FileSetManager(this.logger); Path basepath = this.project.getBasedir().toPath(); try {