You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/02/11 17:30:10 UTC
[1/3] maven git commit: [MNG-6353] Upgrade maven-shared-utils to 3.2.1
Repository: maven
Updated Branches:
refs/heads/master b8c06e61a -> cd34b08df
[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/master
Commit: 24b8820f08f3ff1535931288b7782bb615b1f53d
Parents: 40cf506
Author: rfscholte <rf...@apache.org>
Authored: Sat Feb 10 15:17:03 2018 +0100
Committer: rfscholte <rf...@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>
[2/3] maven git commit: [MNG-6353] Upgrade maven-shared-utils to
3.2.1 Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent
ANSI from staying active when killing an active process
Posted by rf...@apache.org.
[MNG-6353] Upgrade maven-shared-utils to 3.2.1
Add o.a.m.s.u.logging.MessageUtils.registerShutdownHook() to prevent ANSI from staying active when killing an active process
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/22f782ae
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/22f782ae
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/22f782ae
Branch: refs/heads/master
Commit: 22f782aecdba911324d459937e638e33165d7c12
Parents: 24b8820
Author: rfscholte <rf...@apache.org>
Authored: Sat Feb 10 15:28:59 2018 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sat Feb 10 15:28:59 2018 +0100
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/22f782ae/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 fa224d0..07e28bf 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
@@ -191,6 +191,7 @@ public class MavenCli
MavenCli cli = new MavenCli();
MessageUtils.systemInstall();
+ MessageUtils.registerShutdownHook();
int result = cli.doMain( new CliRequest( args, classWorld ) );
MessageUtils.systemUninstall();
[3/3] maven git commit: Merge remote-tracking branch
'remotes/origin/MNG-6353'
Posted by rf...@apache.org.
Merge remote-tracking branch 'remotes/origin/MNG-6353'
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cd34b08d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cd34b08d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cd34b08d
Branch: refs/heads/master
Commit: cd34b08df1f378b44fae3d8020aa1fda8089dc79
Parents: b8c06e6 22f782a
Author: rfscholte <rf...@apache.org>
Authored: Sun Feb 11 18:29:43 2018 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sun Feb 11 18:29:43 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 10 ++++++----
.../src/main/java/org/slf4j/impl/MavenSimpleLogger.java | 11 ++++++-----
pom.xml | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cd34b08d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cd34b08d/pom.xml
----------------------------------------------------------------------