Author: hboutemy
Date: Tue Jun 28 22:09:38 2016
New Revision: 1750592
URL: http://svn.apache.org/viewvc?rev=1750592&view=rev
Log:
[MINVOKER-205] use new improved styled message API
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
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.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=1750592&r1=1750591&r2=1750592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Tue Jun 28 22:09:38 2016
@@ -211,8 +211,8 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-project-utils</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
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=1750592&r1=1750591&r2=1750592&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
Tue Jun 28 22:09:38 2016
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.invoker;
* under the License.
*/
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -81,7 +81,7 @@ import org.apache.maven.shared.invoker.I
import org.apache.maven.shared.invoker.Invoker;
import org.apache.maven.shared.invoker.MavenCommandLineBuilder;
import org.apache.maven.shared.invoker.MavenInvocationException;
-import org.apache.maven.shared.project.utils.AnsiUtils;
+import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.shared.scriptinterpreter.RunErrorException;
import org.apache.maven.shared.scriptinterpreter.RunFailureException;
import org.apache.maven.shared.scriptinterpreter.ScriptRunner;
@@ -1250,7 +1250,7 @@ public abstract class AbstractInvokerMoj
try
{
- AnsiUtils.systemInstall(); // prepare JAnsi if not run with Maven
3.4+
+ MessageUtils.systemInstall(); // prepare JAnsi if not run with
Maven 3.4+
if ( runWithParallelThreads > 1 )
{
@@ -1304,7 +1304,7 @@ public abstract class AbstractInvokerMoj
{
mergedSettingsFile.delete();
}
- AnsiUtils.systemUninstall();
+ MessageUtils.systemUninstall();
}
}
@@ -1412,7 +1412,7 @@ public abstract class AbstractInvokerMoj
basedir = pomFile.getParentFile();
}
- getLog().info( ansi().a( "Building: " ).strong( buildJob.getProject()
).toString() );
+ getLog().info( buffer().a( "Building: " ).strong(
buildJob.getProject() ).toString() );
File interpolatedPomFile = null;
if ( pomFile != null )
@@ -1460,7 +1460,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().success( "SUCCESS " ) +
formatTime( buildJob.getTime() ) );
+ getLog().info( ".." + buffer().success( "SUCCESS " ) +
formatTime( buildJob.getTime() ) );
}
}
else
@@ -1469,7 +1469,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().warning( "SKIPPED " ) +
formatTime( buildJob.getTime() ) );
+ getLog().info( ".." + buffer().warning( "SKIPPED " ) +
formatTime( buildJob.getTime() ) );
}
}
}
@@ -1501,7 +1501,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().warning( "SKIPPED " ) + " due
to " + message.toString() );
+ getLog().info( ".." + buffer().warning( "SKIPPED " ) + "
due to " + message.toString() );
}
// Abuse failureMessage, the field in the report which should
contain the reason for skipping
@@ -1516,7 +1516,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().failure( "ERROR " ) + formatTime(
buildJob.getTime() ) );
+ getLog().info( ".." + buffer().failure( "ERROR " ) +
formatTime( buildJob.getTime() ) );
getLog().info( " " + e.getMessage() );
}
}
@@ -1527,7 +1527,7 @@ public abstract class AbstractInvokerMoj
if ( !suppressSummaries )
{
- getLog().info( ".." + ansi().failure( "FAILED " ) +
formatTime( buildJob.getTime() ) );
+ getLog().info( ".." + buffer().failure( "FAILED " ) +
formatTime( buildJob.getTime() ) );
getLog().info( " " + e.getMessage() );
}
}
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java?rev=1750592&r1=1750591&r2=1750592&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerSession.java
Tue Jun 28 22:09:38 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.utils.logging.MessageUtils.buffer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -198,7 +198,7 @@ class InvokerSession
{
updateStats();
- String separator = ansi().bold().a(
"-------------------------------------------------" ).reset().toString();
+ String separator = buffer().strong(
"-------------------------------------------------" ).toString();
logger.info( separator );
logger.info( "Build Summary:" );
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java?rev=1750592&r1=1750591&r2=1750592&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java
Tue Jun 28 22:09:38 2016
@@ -26,7 +26,7 @@ import org.apache.maven.plugin.invoker.m
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.shared.project.utils.AnsiUtils;
+import org.apache.maven.shared.utils.logging.MessageUtils;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -134,12 +134,12 @@ public class VerifyMojo
{
try
{
- AnsiUtils.systemInstall(); // prepare JAnsi if not run with
Maven 3.4+
+ MessageUtils.systemInstall(); // prepare JAnsi if not run with
Maven 3.4+
invokerSession.logSummary( getLog(), ignoreFailures );
}
finally
{
- AnsiUtils.systemUninstall();
+ MessageUtils.systemUninstall();
}
}
