inteligr8/merge-maven-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix FileSetManager logging change

Browse Source
This commit is contained in:
brian.long
2026-02-09 15:32:15 -05:00
parent 099219befe
commit 65a2250936
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/inteligr8/maven/merge/AbstractMergeMojo.java
+6 -2
View File
@@ -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<FileSet> 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 {
src/main/java/com/inteligr8/maven/merge/AppendFilesContentMojo.java
+5 -1
View File
@@ -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<FileSet> 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 {