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:39 UTC
[maven-assembly-plugin] 02/02: mvn4 aggregator
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 ) );
}
}
}