svn commit: r1747919 - in /maven/plugins/trunk/maven-invoker-plugin: pom.xml src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java src/main/java/org/apache/maven/plugin/invoker/VerifyMojo.java

[hb...@apache.org]

Author: hboutemy
Date: Sat Jun 11 17:10:26 2016
New Revision: 1747919

URL: http://svn.apache.org/viewvc?rev=1747919&view=rev
Log:
[MINVOKER-205] use AnsiUtils from MSHARED-552 to enable colors only with Maven 3.4+

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/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=1747919&r1=1747918&r2=1747919&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Jun 11 17:10:26 2016
@@ -214,6 +214,11 @@ under the License.
       <artifactId>jansi</artifactId>
       <version>1.12</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-project-utils</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

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=1747919&r1=1747918&r2=1747919&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 11 17:10:26 2016
@@ -81,6 +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.scriptinterpreter.RunErrorException;
 import org.apache.maven.shared.scriptinterpreter.RunFailureException;
 import org.apache.maven.shared.scriptinterpreter.ScriptRunner;
@@ -100,7 +101,6 @@ import org.codehaus.plexus.util.cli.Comm
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
-import org.fusesource.jansi.AnsiConsole;
 
 /**
  * Provides common code for mojos invoking sub builds.
@@ -1250,7 +1250,7 @@ public abstract class AbstractInvokerMoj
 
         try
         {
-            AnsiConsole.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
+            AnsiUtils.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
 
             if ( runWithParallelThreads > 1 )
             {
@@ -1304,7 +1304,7 @@ public abstract class AbstractInvokerMoj
             {
                 mergedSettingsFile.delete();
             }
-            AnsiConsole.systemUninstall();
+            AnsiUtils.systemUninstall();
         }
     }
 

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=1747919&r1=1747918&r2=1747919&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 Sat Jun 11 17:10:26 2016
@@ -26,9 +26,9 @@ 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.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.fusesource.jansi.AnsiConsole;
 
 import java.io.File;
 import java.io.IOException;
@@ -134,12 +134,12 @@ public class VerifyMojo
         {
             try
             {
-                AnsiConsole.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
+                AnsiUtils.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
                 invokerSession.logSummary( getLog(), ignoreFailures );
             }
             finally
             {
-                AnsiConsole.systemUninstall();
+                AnsiUtils.systemUninstall();
             }
         }