diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index f254c580dc..c7e5d9ee35 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -190,6 +190,7 @@ public class MavenCli MavenCli cli = new MavenCli(); MessageUtils.systemInstall(); + MessageUtils.registerShutdownHook(); int result = cli.doMain( new CliRequest( args, classWorld ) ); MessageUtils.systemUninstall(); @@ -575,10 +576,11 @@ public class MavenCli { MessageBuilder buff = MessageUtils.buffer(); buff.a( "Message styles: " ); - buff.debug( "debug" ).a( ' ' ); - buff.info( "info" ).a( ' ' ); - buff.warning( "warning" ).a( ' ' ); - buff.error( "error" ).a( ' ' ); + buff.a( MessageUtils.level().debug( "debug" ) ).a( ' ' ); + buff.a( MessageUtils.level().info( "info" ) ).a( ' ' ); + buff.a( MessageUtils.level().warning( "warning" ) ).a( ' ' ); + buff.a( MessageUtils.level().error( "error" ) ).a( ' ' ); + buff.success( "success" ).a( ' ' ); buff.failure( "failure" ).a( ' ' ); buff.strong( "strong" ).a( ' ' ); diff --git a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java index 3c1ca4fe0d..9366687edb 100644 --- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java +++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java @@ -19,6 +19,7 @@ package org.slf4j.impl; * under the License. */ +import static org.apache.maven.shared.utils.logging.MessageUtils.level; import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; import java.io.PrintStream; @@ -42,16 +43,16 @@ public class MavenSimpleLogger switch ( level ) { case LOG_LEVEL_TRACE: - return buffer().debug( "TRACE" ).toString(); + return level().debug( "TRACE" ).toString(); case LOG_LEVEL_DEBUG: - return buffer().debug( "DEBUG" ).toString(); + return level().debug( "DEBUG" ).toString(); case LOG_LEVEL_INFO: - return buffer().info( "INFO" ).toString(); + return level().info( "INFO" ).toString(); case LOG_LEVEL_WARN: - return buffer().warning( "WARNING" ).toString(); + return level().warning( "WARNING" ).toString(); case LOG_LEVEL_ERROR: default: - return buffer().error( "ERROR" ).toString(); + return level().error( "ERROR" ).toString(); } } diff --git a/pom.xml b/pom.xml index b912b67183..455bca0d80 100644 --- a/pom.xml +++ b/pom.xml @@ -287,7 +287,7 @@ under the License. org.apache.maven.shared maven-shared-utils - 3.1.0 + 3.2.1 org.fusesource.jansi