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:37 UTC
[maven-assembly-plugin] branch mvn4 created (now 1818c46)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.
at 1818c46 mvn4 aggregator
This branch includes the following new commits:
new 7c1cc21 wip
new 1818c46 mvn4 aggregator
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-assembly-plugin] 01/02: wip
Posted by gn...@apache.org.
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() );
[maven-assembly-plugin] 02/02: mvn4 aggregator
Posted by gn...@apache.org.
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 1818c461aca564f612a93189239ad95a2fbb1107
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:35 2022 +0100
mvn4 aggregator
---
pom.xml | 26 +++++---
.../assembly/archive/DefaultAssemblyArchiver.java | 3 +-
.../assembly/archive/task/AddFileSetsTask.java | 3 +-
.../plugins/assembly/io/DefaultAssemblyReader.java | 1 -
.../repository/DefaultRepositoryAssembler.java | 1 +
.../plugins/assembly/utils/AbstractLogEnabled.java | 7 ++-
.../maven/plugins/assembly/utils/Slf4jLogger.java | 73 ++++++++++++++--------
.../archive/DefaultAssemblyArchiverTest.java | 8 ++-
.../archive/phase/FileSetAssemblyPhaseTest.java | 5 +-
.../archive/phase/RepositoryAssemblyPhaseTest.java | 7 ++-
.../archive/task/AddDependencySetsTaskTest.java | 19 ++----
.../assembly/archive/task/AddFileSetsTaskTest.java | 9 ++-
.../artifact/DefaultDependencyResolverTest.java | 18 +++---
.../assembly/io/DefaultAssemblyReaderTest.java | 8 ++-
.../plugins/assembly/utils/FilterUtilsTest.java | 15 +----
.../assembly/utils/TypeConversionUtilsTest.java | 46 +++++++-------
16 files changed, 137 insertions(+), 112 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3a81111..7efe468 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,11 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<mdoVersion>2.1.0</mdoVersion>
- <mavenArchiverVersion>3.5.1</mavenArchiverVersion>
- <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenArchiverVersion>3.5.3-SNAPSHOT</mavenArchiverVersion>
+ <mavenFilteringVersion>3.3.0-SNAPSHOT</mavenFilteringVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
<testOutputToFile>true</testOutputToFile>
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod</checkstyle.violation.ignore>
<project.build.outputTimestamp>2020-04-27T17:26:57Z</project.build.outputTimestamp>
@@ -118,12 +118,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.3</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
- <version>3.0</version>
+ <artifactId>maven-compat</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
@@ -133,12 +133,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.1.1</version>
+ <version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.13.1</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -189,9 +189,15 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.33</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
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 74bd8ca..40a996b 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
@@ -35,6 +35,7 @@ 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.apache.maven.plugins.assembly.utils.Slf4jLogger;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.archiver.ArchiveFinalizer;
@@ -341,7 +342,7 @@ public class DefaultAssemblyArchiver
configSource.getWorkingDirectory(), getLogger() );
if ( configSource.isDryRun() )
{
- archiver = new DryRunArchiver( archiver, getLogger() );
+ archiver = new DryRunArchiver( archiver, new Slf4jLogger( getLogger() ) );
}
archiver.setUseJvmChmod( configSource.isUpdateOnly() );
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 8def781..f78d33f 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
@@ -37,6 +37,7 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -213,7 +214,7 @@ public class AddFileSetsTask
{
if ( logger == null )
{
- logger = new ConsoleLogger( Logger.LEVEL_INFO, "AddFileSetsTask-internal" );
+ logger = LoggerFactory.getLogger( getClass() );
}
}
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 7717323..8e5c957 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
@@ -48,7 +48,6 @@ import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
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;
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 105851a..9fcb663 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
@@ -50,6 +50,7 @@ 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.slf4j.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
index bf07f8a..b772238 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/AbstractLogEnabled.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AbstractLogEnabled.java
@@ -1,4 +1,5 @@
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
@@ -21,7 +22,11 @@ package org.apache.maven.plugins.assembly.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AbstractLogEnabled {
+/**
+ * Base class to mimic the plexus one
+ */
+public class AbstractLogEnabled
+{
private Logger logger = LoggerFactory.getLogger( getClass() );
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
index 9415fef..87fd4df 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/Slf4jLogger.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/Slf4jLogger.java
@@ -1,19 +1,24 @@
package org.apache.maven.plugins.assembly.utils;
/*
- * Copyright (c) 2010 Sonatype, Inc. All rights reserved.
+ * 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
*
- * 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.
+ * 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.
+ * 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.codehaus.plexus.logging.Logger;
/**
@@ -32,7 +37,7 @@ public class Slf4jLogger
// enables default constructor
}
- public Slf4jLogger(org.slf4j.Logger logger )
+ public Slf4jLogger( org.slf4j.Logger logger )
{
setLogger( logger );
}
@@ -58,82 +63,98 @@ public class Slf4jLogger
}
@Override
- public void info( String message ) {
+ public void info( String message )
+ {
logger.info( message );
}
@Override
- public void info(String message, Throwable throwable) {
+ public void info( String message, Throwable throwable )
+ {
}
@Override
- public boolean isInfoEnabled() {
+ public boolean isInfoEnabled()
+ {
return false;
}
@Override
- public void warn(String message) {
+ public void warn( String message )
+ {
}
@Override
- public void warn(String message, Throwable throwable) {
+ public void warn( String message, Throwable throwable )
+ {
}
@Override
- public boolean isWarnEnabled() {
+ public boolean isWarnEnabled()
+ {
return false;
}
@Override
- public void error(String message) {
+ public void error( String message )
+ {
}
@Override
- public void error(String message, Throwable throwable) {
+ public void error( String message, Throwable throwable )
+ {
}
@Override
- public boolean isErrorEnabled() {
+ public boolean isErrorEnabled()
+ {
return false;
}
@Override
- public void fatalError(String message) {
+ public void fatalError( String message )
+ {
}
@Override
- public void fatalError(String message, Throwable throwable) {
+ public void fatalError( String message, Throwable throwable )
+ {
}
@Override
- public boolean isFatalErrorEnabled() {
+ public boolean isFatalErrorEnabled()
+ {
return false;
}
@Override
- public int getThreshold() {
+ public int getThreshold()
+ {
return 0;
}
@Override
- public void setThreshold(int threshold) {
+ public void setThreshold( int threshold )
+ {
}
@Override
- public Logger getChildLogger(String name) {
+ public Logger getChildLogger( String name )
+ {
return null;
}
@Override
- public String getName() {
+ public String getName()
+ {
return null;
}
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
index dd41811..638e950 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
@@ -56,14 +56,14 @@ import org.codehaus.plexus.archiver.tar.TarLongFileMode;
import org.codehaus.plexus.archiver.war.WarArchiver;
import org.codehaus.plexus.archiver.zip.ZipArchiver;
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;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class DefaultAssemblyArchiverTest
@@ -71,6 +71,8 @@ public class DefaultAssemblyArchiverTest
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
private PlexusContainer container;
public static void setupInterpolators( AssemblerConfigurationSource configSource )
@@ -513,7 +515,7 @@ public class DefaultAssemblyArchiverTest
if ( logger == null )
{
- logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ logger = this.logger;
}
subject.enableLogging( logger );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
index d24ada7..927e015 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
@@ -31,17 +31,18 @@ import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.FileSet;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class FileSetAssemblyPhaseTest
{
private FileSetAssemblyPhase phase;
-
+
@Before
public void setUp()
{
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 50bdb4a..5e5a00e 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
@@ -47,13 +47,16 @@ 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 RepositoryAssemblyPhaseTest
{
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
+
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
private RepositoryAssemblyPhase phase;
private RepositoryAssembler repositoryAssembler;
@@ -107,7 +110,7 @@ public class RepositoryAssemblyPhaseTest
repo.setFileMode( "777" );
assembly.addRepository( repo );
- final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int mode = TypeConversionUtils.modeToInt( "777", logger );
final int defaultDirMode = -1;
final int defaultFileMode = -1;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
index 5867742..11756c4 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
@@ -70,10 +70,13 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class AddDependencySetsTaskTest
{
+ org.slf4j.Logger logger = LoggerFactory.getLogger( getClass() );
+
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -145,8 +148,6 @@ public class AddDependencySetsTaskTest
DefaultAssemblyArchiverTest.setupInterpolators( configSource, mainProject );
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( ds ), Collections.singleton( depArtifact ),
depProject, projectBuilder, logger );
@@ -182,8 +183,6 @@ public class AddDependencySetsTaskTest
final DependencySet ds = new DependencySet();
ds.setOutputDirectory( "/out" );
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( ds ), null, project, null, logger );
@@ -238,8 +237,6 @@ public class AddDependencySetsTaskTest
ds.setOutputDirectory( "/out" );
DefaultAssemblyArchiverTest.setupInterpolators( configSource, project );
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( ds ), Collections.singleton( depArtifact ),
project, projectBuilder, logger );
@@ -324,8 +321,6 @@ public class AddDependencySetsTaskTest
final ProjectBuilder projectBuilder = mock( ProjectBuilder.class );
when( projectBuilder.build( any( Artifact.class ), any( ProjectBuildingRequest.class ) ) ).thenReturn( pbr );
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ),
Collections.singleton(
artifact ), project,
@@ -373,8 +368,6 @@ public class AddDependencySetsTaskTest
final DependencySet dependencySet = new DependencySet();
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( dependencySet ),
Collections.singleton(
artifact ), project,
@@ -413,8 +406,6 @@ public class AddDependencySetsTaskTest
dependencySet.addInclude( "group:artifact" );
dependencySet.setUseTransitiveFiltering( true );
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( dependencySet ), artifacts, project, null, logger );
@@ -451,8 +442,6 @@ public class AddDependencySetsTaskTest
dependencySet.addInclude( "group:artifact" );
dependencySet.setUseTransitiveFiltering( false );
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
final AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( dependencySet ), artifacts, project, null, logger );
@@ -501,7 +490,7 @@ public class AddDependencySetsTaskTest
when( projectBuilder.build( any( Artifact.class ), eq( pbReq ) ) ).thenReturn( pbRes );
final AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( dependencySet ),
- artifacts, project, projectBuilder, mock( Logger.class ) );
+ artifacts, project, projectBuilder, logger );
final MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( pbReq );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
index 53998cd..c4ffdb9 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
@@ -38,13 +38,12 @@ import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
import org.apache.maven.plugins.assembly.model.FileSet;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
-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.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class AddFileSetsTaskTest
@@ -143,7 +142,7 @@ public class AddFileSetsTaskTest
final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
- task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ task.setLogger( LoggerFactory.getLogger( getClass() ) );
task.setProject( project );
task.addFileSet( fs, archiver, configSource, null );
@@ -183,7 +182,7 @@ public class AddFileSetsTaskTest
DefaultAssemblyArchiverTest.setupInterpolators( configSource, project );
final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
- task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ task.setLogger( LoggerFactory.getLogger( getClass() ) );
task.setProject( project );
task.addFileSet( fs, archiver, configSource, archiveBaseDir );
@@ -220,7 +219,7 @@ public class AddFileSetsTaskTest
final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
- task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ task.setLogger( LoggerFactory.getLogger( getClass() ) );
task.setProject( project );
task.addFileSet( fs, archiver, configSource, archiveBaseDir );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
index 66e8ecb..ebd6530 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.repository.LegacyLocalRepositoryManager;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -40,14 +39,17 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
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.project.MavenProject;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.PlexusTestCase;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
public class DefaultDependencyResolverTest
extends PlexusTestCase
@@ -65,14 +67,16 @@ public class DefaultDependencyResolverTest
}
protected MavenSession newMavenSession( MavenProject project )
+ throws NoLocalRepositoryManagerException
{
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
MavenExecutionResult result = new DefaultMavenExecutionResult();
- MavenRepositorySystemSession repoSession = new MavenRepositorySystemSession();
-
- repoSession.setLocalRepositoryManager( LegacyLocalRepositoryManager.wrap( new StubArtifactRepository( "target/local-repo" ),
- null ) );
+ DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession();
+
+ LocalRepository localRepo = new LocalRepository( "target/local-repo" );
+ repoSession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) );
MavenSession session = new MavenSession( getContainer(), repoSession, request, result );
session.setCurrentProject( project );
session.setProjects( Arrays.asList( project ) );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
index 137c6f1..939c88e 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
@@ -59,14 +59,14 @@ import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Writer;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
import org.codehaus.plexus.interpolation.fixed.InterpolationState;
-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;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class DefaultAssemblyReaderTest
@@ -74,6 +74,8 @@ public class DefaultAssemblyReaderTest
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
private AssemblerConfigurationSource configSource;
public static StringReader writeToStringReader( Assembly assembly )
@@ -355,7 +357,7 @@ public class DefaultAssemblyReaderTest
InterpolationState is = new InterpolationState();
ComponentXpp3Reader.ContentTransformer componentIp =
AssemblyInterpolator.componentInterpolator( FixedStringSearchInterpolator.create(), is,
- new ConsoleLogger( Logger.LEVEL_DEBUG, "console" ) );
+ logger );
new DefaultAssemblyReader().mergeComponentsWithMainAssembly( assembly, null, configSource, componentIp );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java
index 986e092..e3d3d02 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java
@@ -37,24 +37,17 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
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.hamcrest.Matchers;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
@RunWith( MockitoJUnitRunner.class )
public class FilterUtilsTest
{
- private Logger logger;
-
- @Before
- public void setUp()
- {
- logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- }
+ private Logger logger = LoggerFactory.getLogger( getClass() );
@Test
public void testFilterArtifacts_ShouldThrowExceptionUsingStrictModeWithUnmatchedInclude()
@@ -329,8 +322,6 @@ public class FilterUtilsTest
exclusions = Collections.emptyList();
}
- final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
-
Set<MavenProject> result =
FilterUtils.filterProjects( projects, inclusions, exclusions, depTrail != null, logger );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java
index 8b4976d..861d732 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java
@@ -21,23 +21,28 @@ package org.apache.maven.plugins.assembly.utils;
import junit.framework.TestCase;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.List;
+import static org.mockito.Mockito.mock;
+
public class TypeConversionUtilsTest
extends TestCase
{
+ protected Logger logger = LoggerFactory.getLogger( getClass() );
+
public void testModeToInt_InterpretAsOctalWithoutLeadingZero()
throws AssemblyFormattingException
{
final int check = Integer.decode( "0777" );
- final int test = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int test = TypeConversionUtils.modeToInt( "777", logger );
assertEquals( check, test );
}
@@ -46,7 +51,7 @@ public class TypeConversionUtilsTest
throws AssemblyFormattingException
{
final int check = Integer.decode( "0777" );
- final int test = TypeConversionUtils.modeToInt( "0777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int test = TypeConversionUtils.modeToInt( "0777", logger );
assertEquals( check, test );
}
@@ -55,7 +60,7 @@ public class TypeConversionUtilsTest
{
try
{
- TypeConversionUtils.modeToInt( "493", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ TypeConversionUtils.modeToInt( "493", logger );
fail( "'493' is an invalid mode and should trigger an exception." );
}
@@ -93,31 +98,26 @@ public class TypeConversionUtilsTest
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final PrintStream ps = new PrintStream( baos );
- final PrintStream oldOut = System.out;
- final PrintStream oldErr = System.err;
-
- try
- {
- System.setOut( ps );
- System.setErr( ps );
+ final Logger macLogger = ( Logger ) Proxy.newProxyInstance(
+ getClass().getClassLoader(),
+ new Class<?>[] { Logger.class },
+ ( proxy, method, args ) ->
+ {
+ ps.println( args[0] );
+ return null;
+ } );
- assertEquals( "Mode sanity should be: " + isSane, isSane,
- TypeConversionUtils.verifyModeSanity( Integer.parseInt( mode, 8 ),
- new ConsoleLogger( Logger.LEVEL_WARN, "test" ) ) );
- }
- finally
- {
- System.setOut( oldOut );
- System.setErr( oldErr );
- }
+ assertEquals( "Mode sanity should be: " + isSane, isSane,
+ TypeConversionUtils.verifyModeSanity( Integer.parseInt( mode, 8 ),
+ macLogger ) );
if ( !isSane && messagesToCheckIfInsane != null && !messagesToCheckIfInsane.isEmpty() )
{
- final String message = new String( baos.toByteArray() );
+ final String message = baos.toString();
for ( final String checkMessage : messagesToCheckIfInsane )
{
- assertTrue( "\'" + checkMessage + "\' is not present in output.", message.contains( checkMessage ) );
+ assertTrue( "'" + checkMessage + "' is not present in output.", message.contains( checkMessage ) );
}
}
}