You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/07/26 21:38:36 UTC
svn commit: r1754184 - 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
Author: hboutemy
Date: Tue Jul 26 21:38:36 2016
New Revision: 1754184
URL: http://svn.apache.org/viewvc?rev=1754184&view=rev
Log:
[MINVOKER-205] use released maven-shared-utils 3.1.0
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=1754184&r1=1754183&r2=1754184&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Tue Jul 26 21:38:36 2016
@@ -207,7 +207,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.1.0</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=1754184&r1=1754183&r2=1754184&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 Jul 26 21:38:36 2016
@@ -84,7 +84,6 @@ import org.apache.maven.shared.invoker.M
import org.apache.maven.shared.scriptinterpreter.RunErrorException;
import org.apache.maven.shared.scriptinterpreter.RunFailureException;
import org.apache.maven.shared.scriptinterpreter.ScriptRunner;
-import org.apache.maven.shared.utils.logging.MessageUtils;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.MapBasedValueSource;
@@ -1185,8 +1184,6 @@ public abstract class AbstractInvokerMoj
try
{
- MessageUtils.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
-
if ( runWithParallelThreads > 1 )
{
getLog().info( "use parallelThreads " + runWithParallelThreads );
@@ -1239,7 +1236,6 @@ public abstract class AbstractInvokerMoj
{
mergedSettingsFile.delete();
}
- MessageUtils.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=1754184&r1=1754183&r2=1754184&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 Jul 26 21:38:36 2016
@@ -26,7 +26,6 @@ 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.utils.logging.MessageUtils;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -132,15 +131,7 @@ public class VerifyMojo
if ( !suppressSummaries )
{
- try
- {
- MessageUtils.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
- invokerSession.logSummary( getLog(), ignoreFailures );
- }
- finally
- {
- MessageUtils.systemUninstall();
- }
+ invokerSession.logSummary( getLog(), ignoreFailures );
}
invokerSession.handleFailures( getLog(), ignoreFailures );