You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:14:38 UTC
[maven-assembly-plugin] 01/02: wip
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 7c1cc21d094fb02b2ea4ee1f63c74b6ae84e3b8b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 08:17:57 2022 +0100
wip
---
.../assembly/archive/DefaultAssemblyArchiver.java | 2 +-
.../archive/archiver/AssemblyProxyArchiver.java | 2 +-
.../archive/phase/DependencySetAssemblyPhase.java | 4 +-
.../archive/phase/FileItemAssemblyPhase.java | 2 +-
.../archive/phase/FileSetAssemblyPhase.java | 2 +-
.../archive/phase/ModuleSetAssemblyPhase.java | 4 +-
.../archive/phase/RepositoryAssemblyPhase.java | 2 +-
.../assembly/archive/task/AddArtifactTask.java | 2 +-
.../archive/task/AddDependencySetsTask.java | 2 +-
.../assembly/archive/task/AddFileSetsTask.java | 3 +-
.../artifact/DefaultDependencyResolver.java | 2 +-
.../filter/SimpleAggregatingDescriptorHandler.java | 27 +---
.../plugins/assembly/functions/MavenProjects.java | 2 +-
.../interpolation/AssemblyInterpolator.java | 2 +-
.../plugins/assembly/io/DefaultAssemblyReader.java | 19 +--
.../repository/DefaultRepositoryAssembler.java | 3 +-
.../plugins/assembly/utils/AbstractLogEnabled.java | 47 +++++++
.../assembly/utils/AssemblyFormatUtils.java | 2 +-
.../maven/plugins/assembly/utils/FilterUtils.java | 2 +-
.../maven/plugins/assembly/utils/ProjectUtils.java | 2 +-
.../maven/plugins/assembly/utils/Slf4jLogger.java | 139 +++++++++++++++++++++
.../assembly/utils/TypeConversionUtils.java | 2 +-
.../archiver/AssemblyProxyArchiverTest.java | 12 +-
.../archive/phase/FileItemAssemblyPhaseTest.java | 38 +++---
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 2 +-
.../archive/phase/RepositoryAssemblyPhaseTest.java | 3 +-
.../assembly/archive/task/AddArtifactTaskTest.java | 14 ++-
.../plugins/assembly/utils/ProjectUtilsTest.java | 16 +--
28 files changed, 250 insertions(+), 109 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
index 195aea2..74bd8ca 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
@@ -32,6 +32,7 @@ import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.interpolation.AssemblyExpressionEvaluator;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.ContainerDescriptorHandlerConfig;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils;
import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils;
import org.codehaus.plexus.PlexusConstants;
@@ -60,7 +61,6 @@ import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
index 2b0cd06..88acf1e 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import javax.annotation.Nonnull;
import java.io.File;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java
index 09e9ff1..732abed 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java
@@ -29,13 +29,13 @@ import org.apache.maven.plugins.assembly.artifact.DependencyResolver;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.project.ProjectBuilder;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import java.util.Collections;
import java.util.Map;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
index 68d23aa..9af2ae6 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
@@ -38,6 +38,7 @@ import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.format.ReaderFormatter;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.FileItem;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils;
import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugins.assembly.utils.TypeConversionUtils;
@@ -48,7 +49,6 @@ import org.codehaus.plexus.components.io.functions.ContentSupplier;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
/**
* Handles the top-level <files/> section of the assembly descriptor.
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java
index 98ce40d..3d6c9cd 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java
@@ -25,9 +25,9 @@ import org.apache.maven.plugins.assembly.archive.task.AddFileSetsTask;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.FileSet;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import javax.annotation.Nonnull;
import java.util.List;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
index e35c8e8..9237fa8 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
@@ -38,6 +38,7 @@ import org.apache.maven.plugins.assembly.model.FileSet;
import org.apache.maven.plugins.assembly.model.ModuleBinaries;
import org.apache.maven.plugins.assembly.model.ModuleSet;
import org.apache.maven.plugins.assembly.model.ModuleSources;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils;
import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugins.assembly.utils.FilterUtils;
@@ -50,8 +51,7 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import javax.annotation.Nonnull;
import java.io.File;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
index d328a93..cd420de 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
@@ -32,12 +32,12 @@ import org.apache.maven.plugins.assembly.repository.RepositoryAssembler;
import org.apache.maven.plugins.assembly.repository.RepositoryAssemblyException;
import org.apache.maven.plugins.assembly.repository.RepositoryBuilderConfigSource;
import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugins.assembly.utils.TypeConversionUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
import java.util.List;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java
index 6a281e7..ea04cca 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java
@@ -31,9 +31,9 @@ import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
import java.io.File;
import java.io.IOException;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
index f99aa27..cc31af7 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
@@ -53,7 +53,7 @@ import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
*
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
index 1f6a1d2..8def781 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
@@ -36,8 +36,7 @@ import org.apache.maven.plugins.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.slf4j.Logger;
/**
*
diff --git a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
index b4ef76f..5a586ba 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
@@ -32,11 +32,11 @@ import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.plugins.assembly.model.ModuleBinaries;
import org.apache.maven.plugins.assembly.model.ModuleSet;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
/**
diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
index 2fa7373..a650ed1 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
@@ -19,15 +19,13 @@ package org.apache.maven.plugins.assembly.filter;
* under the License.
*/
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.logging.LogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.IOUtil;
import javax.annotation.Nonnull;
@@ -51,7 +49,8 @@ import java.util.List;
*/
@Component( role = ContainerDescriptorHandler.class, hint = "file-aggregator", instantiationStrategy = "per-lookup" )
public class SimpleAggregatingDescriptorHandler
- implements ContainerDescriptorHandler, LogEnabled
+ extends AbstractLogEnabled
+ implements ContainerDescriptorHandler
{
// component configuration.
@@ -71,10 +70,6 @@ public class SimpleAggregatingDescriptorHandler
private boolean overrideFilterAction;
- // injected by the container.
-
- private Logger logger;
-
@Override
public void finalizeArchiveCreation( final Archiver archiver )
{
@@ -202,22 +197,6 @@ public class SimpleAggregatingDescriptorHandler
}
}
- protected final Logger getLogger()
- {
- if ( logger == null )
- {
- logger = new ConsoleLogger( Logger.LEVEL_INFO, "" );
- }
-
- return logger;
- }
-
- @Override
- public void enableLogging( final Logger logger )
- {
- this.logger = logger;
- }
-
@SuppressWarnings( "UnusedDeclaration" )
public String getFilePattern()
{
diff --git a/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java b/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
index 0fafd2a..5e17359 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
@@ -22,7 +22,7 @@ package org.apache.maven.plugins.assembly.functions;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import javax.annotation.Nullable;
import java.util.List;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
index c743856..75c780f 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
import org.codehaus.plexus.interpolation.fixed.InterpolationState;
import org.codehaus.plexus.interpolation.object.FieldBasedObjectInterpolator;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import javax.annotation.Nonnull;
import java.io.File;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
index 3344c53..7717323 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
@@ -35,6 +35,7 @@ import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader;
import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Writer;
import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Reader;
import org.apache.maven.plugins.assembly.resolved.AssemblyId;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.plugins.assembly.utils.InterpolationConstants;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.ReaderFactory;
@@ -44,12 +45,10 @@ import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
import org.codehaus.plexus.interpolation.fixed.InterpolationState;
import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
import java.io.File;
import java.io.IOException;
@@ -497,18 +496,4 @@ public class DefaultAssemblyReader
assembly.addFileSet( siteFileSet );
}
- @Override
- protected Logger getLogger()
- {
- Logger logger = super.getLogger();
-
- if ( logger == null )
- {
- logger = new ConsoleLogger( Logger.LEVEL_INFO, "assemblyReader-internal" );
- enableLogging( logger );
- }
-
- return logger;
- }
-
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
index ffc6b12..105851a 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment;
import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
+import org.apache.maven.plugins.assembly.utils.AbstractLogEnabled;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
@@ -49,8 +50,6 @@ import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
/**
* @author Jason van Zyl
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AbstractLogEnabled.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AbstractLogEnabled.java
new file mode 100644
index 0000000..bf07f8a
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AbstractLogEnabled.java
@@ -0,0 +1,47 @@
+package org.apache.maven.plugins.assembly.utils;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AbstractLogEnabled {
+
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
+ protected Logger getLogger()
+ {
+ return logger;
+ }
+
+ public void setLogger( Logger logger )
+ {
+ this.logger = logger;
+ }
+
+ public void enableLogging( Logger logger )
+ {
+ this.logger = logger;
+ }
+
+ public org.codehaus.plexus.logging.Logger getPlexusLogger()
+ {
+ return new Slf4jLogger( logger );
+ }
+}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
index 363e286..6005831 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
@@ -41,8 +41,8 @@ import org.codehaus.plexus.interpolation.fixed.MapBasedValueSource;
import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
/**
*
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java
index df4ee99..8f0ec54 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java
@@ -38,7 +38,7 @@ import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
import org.apache.maven.shared.artifact.filter.StatisticsReportingArtifactFilter;
import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
*
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
index e420a82..65b5320 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugins.assembly.utils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/Slf4jLogger.java b/src/main/java/org/apache/maven/plugins/assembly/utils/Slf4jLogger.java
new file mode 100644
index 0000000..9415fef
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/Slf4jLogger.java
@@ -0,0 +1,139 @@
+package org.apache.maven.plugins.assembly.utils;
+
+/*
+ * Copyright (c) 2010 Sonatype, Inc. All rights reserved.
+ *
+ * This program is licensed to you under the Apache License Version 2.0,
+ * and you may not use this file except in compliance with the Apache License Version 2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the Apache License Version 2.0 is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ */
+
+
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * A logger that delegates to Slf4J logging.
+ *
+ * @author Benjamin Bentmann
+ */
+public class Slf4jLogger
+ implements Logger
+{
+
+ private org.slf4j.Logger logger;
+
+ public Slf4jLogger()
+ {
+ // enables default constructor
+ }
+
+ public Slf4jLogger(org.slf4j.Logger logger )
+ {
+ setLogger( logger );
+ }
+
+ public void setLogger( org.slf4j.Logger logger )
+ {
+ this.logger = logger;
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return logger.isDebugEnabled();
+ }
+
+ public void debug( String msg )
+ {
+ logger.debug( msg );
+ }
+
+ public void debug( String msg, Throwable error )
+ {
+ logger.debug( msg, error );
+ }
+
+ @Override
+ public void info( String message ) {
+ logger.info( message );
+ }
+
+ @Override
+ public void info(String message, Throwable throwable) {
+
+ }
+
+ @Override
+ public boolean isInfoEnabled() {
+ return false;
+ }
+
+ @Override
+ public void warn(String message) {
+
+ }
+
+ @Override
+ public void warn(String message, Throwable throwable) {
+
+ }
+
+ @Override
+ public boolean isWarnEnabled() {
+ return false;
+ }
+
+ @Override
+ public void error(String message) {
+
+ }
+
+ @Override
+ public void error(String message, Throwable throwable) {
+
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return false;
+ }
+
+ @Override
+ public void fatalError(String message) {
+
+ }
+
+ @Override
+ public void fatalError(String message, Throwable throwable) {
+
+ }
+
+ @Override
+ public boolean isFatalErrorEnabled() {
+ return false;
+ }
+
+ @Override
+ public int getThreshold() {
+ return 0;
+ }
+
+ @Override
+ public void setThreshold(int threshold) {
+
+ }
+
+ @Override
+ public Logger getChildLogger(String name) {
+ return null;
+ }
+
+ @Override
+ public String getName() {
+ return null;
+ }
+}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java
index 6565a9d..9600f79 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java
@@ -20,7 +20,7 @@ package org.apache.maven.plugins.assembly.utils;
*/
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
import java.util.List;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
index 7121297..db00cb3 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
@@ -47,14 +47,14 @@ import org.codehaus.plexus.archiver.util.DefaultFileSet;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class AssemblyProxyArchiverTest
@@ -62,7 +62,7 @@ public class AssemblyProxyArchiverTest
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
- private static final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ private static final Logger logger = LoggerFactory.getLogger( AssemblyProxyArchiverTest.class );
@Test( timeout = 5000 )
public void addFileSet_SkipWhenSourceIsAssemblyWorkDir()
@@ -131,7 +131,7 @@ public class AssemblyProxyArchiverTest
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "", delegate, null, selectors, null, new File( "." ),
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ logger );
archiver.setForced( true );
final File inputFile = temporaryFolder.newFile();
@@ -158,7 +158,7 @@ public class AssemblyProxyArchiverTest
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "", delegate, null, selectors, null, new File( "." ),
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ logger );
archiver.setForced( true );
@@ -181,7 +181,7 @@ public class AssemblyProxyArchiverTest
final AssemblyProxyArchiver archiver =
new AssemblyProxyArchiver( "prefix", delegate, null, selectors, null,
new File( temporaryFolder.getRoot(), "module1" ),
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ logger );
FileSet fileSet = mock( FileSet.class );
when( fileSet.getDirectory() ).thenReturn( temporaryFolder.getRoot() );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
index 62d4ac5..eddb47b 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
@@ -39,17 +39,18 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class FileItemAssemblyPhaseTest
{
+
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -109,8 +110,7 @@ public class FileItemAssemblyPhaseTest
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "file.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
}
@Test
@@ -149,8 +149,7 @@ public class FileItemAssemblyPhaseTest
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "file.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
}
@Test
@@ -213,18 +212,15 @@ public class FileItemAssemblyPhaseTest
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "README.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "LICENSE.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "config/config.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
}
@@ -291,18 +287,15 @@ public class FileItemAssemblyPhaseTest
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "README_renamed.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "LICENSE_renamed.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "config/config_renamed.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
}
@Test
@@ -366,18 +359,15 @@ public class FileItemAssemblyPhaseTest
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "README_renamed.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "LICENSE_renamed.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
verify( macArchiver ).addResource( any( PlexusIoResource.class ),
eq( "config/config_renamed.txt" ),
eq( TypeConversionUtils.modeToInt( "777",
- new ConsoleLogger( Logger.LEVEL_DEBUG,
- "test" ) ) ) );
+ macLogger ) ) );
}
private FileItemAssemblyPhase createPhase( final Logger logger )
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
index 1484e7b..77f3f65 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
@@ -59,13 +59,13 @@ import org.apache.maven.plugins.assembly.model.ModuleSources;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
@RunWith( MockitoJUnitRunner.class )
public class ModuleSetAssemblyPhaseTest
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
index 74dd87f..50bdb4a 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
@@ -40,14 +40,13 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
@RunWith( MockitoJUnitRunner.class )
public class RepositoryAssemblyPhaseTest
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
index db4133e..a9da902 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
@@ -41,8 +41,6 @@ import org.apache.maven.plugins.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -50,10 +48,14 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class AddArtifactTaskTest
{
+ private final Logger logger = LoggerFactory.getLogger( getClass() );
+
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -142,7 +144,7 @@ public class AddArtifactTaskTest
DefaultAssemblyArchiverTest.setupInterpolators( configSource, mainProject );
- AddArtifactTask task = new AddArtifactTask( artifact, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ AddArtifactTask task = new AddArtifactTask( artifact, logger, null );
task.setOutputDirectory( outputDir );
task.setFileNameMapping( new DependencySet().getOutputFileNameMapping() );
@@ -167,7 +169,7 @@ public class AddArtifactTaskTest
private AddArtifactTask createTask( Artifact artifact )
{
- AddArtifactTask task = new AddArtifactTask( artifact, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ AddArtifactTask task = new AddArtifactTask( artifact, logger, null );
task.setFileNameMapping( "artifact" );
@@ -207,8 +209,8 @@ public class AddArtifactTaskTest
public void testShouldAddArchiveFileWithUnpackAndModes()
throws Exception
{
- final int directoryMode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- final int fileMode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int directoryMode = TypeConversionUtils.modeToInt( "777", logger );
+ final int fileMode = TypeConversionUtils.modeToInt( "777", logger );
final int originalDirMode = -1;
final int originalFileMode = -1;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java
index bd8aa33..bdb8327 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java
@@ -22,8 +22,8 @@ package org.apache.maven.plugins.assembly.utils;
import junit.framework.TestCase;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -37,6 +37,8 @@ public class ProjectUtilsTest
extends TestCase
{
+ private final Logger logger = LoggerFactory.getLogger( getClass() );
+
private MavenProject createTestProject( final String artifactId, final String groupId, final String version )
{
final Model model = new Model();
@@ -66,7 +68,7 @@ public class ProjectUtilsTest
projects.add( module );
final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
+ ProjectUtils.getProjectModules( master, projects, true, logger );
assertNotNull( result );
assertEquals( 1, result.size() );
@@ -80,7 +82,7 @@ public class ProjectUtilsTest
final Set<MavenProject> result =
ProjectUtils.getProjectModules( master, Collections.singletonList( master ), true,
- new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
+ logger );
assertNotNull( result );
assertTrue( result.isEmpty() );
@@ -112,7 +114,7 @@ public class ProjectUtilsTest
projects.add( subModule );
final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
+ ProjectUtils.getProjectModules( master, projects, true, logger );
assertNotNull( result );
assertEquals( 2, result.size() );
@@ -149,7 +151,7 @@ public class ProjectUtilsTest
projects.add( subModule );
final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, false, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
+ ProjectUtils.getProjectModules( master, projects, false, logger );
assertNotNull( result );
assertEquals( 1, result.size() );
@@ -178,7 +180,7 @@ public class ProjectUtilsTest
projects.add( other );
final Set<MavenProject> result =
- ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
+ ProjectUtils.getProjectModules( master, projects, true, logger );
assertNotNull( result );
assertTrue( result.isEmpty() );