Author: hboutemy
Date: Sat Jun 18 05:52:09 2016
New Revision: 1748914
URL: http://svn.apache.org/viewvc?rev=1748914&view=rev
Log:
[MINVOKER-205] use AnsiUtils to build messages with consistent colors instead
of JAnsi's Ansi
Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1748914&r1=1748913&r2=1748914&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Jun 18 05:52:09 2016
@@ -210,11 +210,6 @@ under the License.
</exclusions>
</dependency>
<dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-project-utils</artifactId>
<version>1.0.0-SNAPSHOT</version>
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1748914&r1=1748913&r2=1748914&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Sat Jun 18 05:52:09 2016
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.invoker;
* under the License.
*/
-import static org.fusesource.jansi.Ansi.ansi;
+import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -1412,7 +1412,7 @@ public abstract class AbstractInvokerMoj
basedir = pomFile.getParentFile();
}
- getLog().info( ansi().a( "Building: " ).bold().a(
buildJob.getProject() ).reset().toString() );
+ getLog().info( ansi().a( "Building: " ).strong().a(
buildJob.getProject() ).reset().toString() );
File interpolatedPomFile = null;
if ( pomFile != null )
@@ -1460,7 +1460,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().bold().fgGreen().a(
"SUCCESS " ).reset()
+ getLog().info( ".." + ansi().success().a( "SUCCESS "
).reset()
+ formatTime( buildJob.getTime() ) );
}
}
@@ -1470,7 +1470,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().bold().fgYellow().a(
"SKIPPED " ).reset()
+ getLog().info( ".." + ansi().warning().a( "SKIPPED "
).reset()
+ formatTime( buildJob.getTime() ) );
}
}
@@ -1503,7 +1503,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().bold().fgYellow().a( "SKIPPED
" ).reset() + " due to "
+ getLog().info( ".." + ansi().warning().a( "SKIPPED "
).reset() + " due to "
+ message.toString() );
}
@@ -1519,7 +1519,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().bold().fgRed().a( "ERROR "
).reset() + formatTime( buildJob.getTime() ) );
+ getLog().info( ".." + ansi().failure().a( "ERROR " ).reset() +
formatTime( buildJob.getTime() ) );
getLog().info( " " + e.getMessage() );
}
}
@@ -1530,7 +1530,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().bold().fgRed().a( "FAILED "
).reset() + formatTime( buildJob.getTime() ) );
+ getLog().info( ".." + ansi().failure().a( "FAILED " ).reset()
+ formatTime( buildJob.getTime() ) );
getLog().info( " " + e.getMessage() );
}
}