[MNG-6353] Upgrade maven-shared-utils to 3.2.1

pulllock · Feb 10, 2018 · 24b8820 · 24b8820
1 parent 40cf506
commit 24b8820
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
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
@@ -576,10  576,11 @@ else if ( MavenExecutionRequest.CHECKSUM_POLICY_FAIL.equals( cliRequest.request.
             {
                 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
@@ -19,6  19,7 @@
  * 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 @@ protected String renderLevel( int level )
         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
@@ -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>