Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/MNG-6353'

This commit is contained in:
rfscholte 2018-02-11 18:29:43 +01:00
parent b8c06e61ab 22f782aecd
commit cd34b08df1
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -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( ' ' );

11
maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
View File

@ -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();
}
}

2
pom.xml
View File

@ -287,7 +287,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>