Repository: maven Updated Branches: refs/heads/MNG-6352-print-version 79f501ea6 -> d9c49f13a (forced update)
[MNG-6353] Upgrade maven-shared-utils to 3.2.1 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/24b8820f Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/24b8820f Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/24b8820f Branch: refs/heads/MNG-6352-print-version Commit: 24b8820f08f3ff1535931288b7782bb615b1f53d Parents: 40cf506 Author: rfscholte <rfscho...@apache.org> Authored: Sat Feb 10 15:17:03 2018 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Sat Feb 10 15:17:03 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/cli/MavenCli.java | 9 +++++---- .../src/main/java/org/slf4j/impl/MavenSimpleLogger.java | 11 ++++++----- pom.xml | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- 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 77ef134..fa224d0 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 @@ -576,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( ' ' ); http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java ---------------------------------------------------------------------- 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 3c1ca4f..9366687 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(); } } http://git-wip-us.apache.org/repos/asf/maven/blob/24b8820f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 66b9d27..618a215 100644 --- 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>
