Commit 65a22509 authored by Brian Long's avatar Brian Long
Browse files

fix FileSetManager logging change

parent 099219be

src/main/java/com/inteligr8/maven/merge/AbstractMergeMojo.java

+6 −2
Original line number Diff line number Diff line
@@ -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.
@@ -34,6 +36,8 @@ import org.apache.maven.shared.model.fileset.util.FileSetManager; 
 */

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
Original line number Diff line number Diff line
@@ -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
@@ -36,6 +38,8 @@ import org.codehaus.plexus.component.annotations.Component; 
@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 {