From 400e7e597902c5c5383abe020579a9a50f3b76f8 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Tue, 27 Aug 2019 09:08:57 +0200
Subject: [PATCH] [MNG-6747] Generalize 'resume from' message when build
 reactor fails

---
 .../src/main/java/org/apache/maven/cli/MavenCli.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 ff5fcc7fe1..d210183163 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
@@ -433,7 +433,7 @@ public class MavenCli
     private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
     {
         CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
-        
+
         // the args are easy, cli first then config file
         for ( String arg : mavenArgs.getArgs() )
         {
@@ -443,7 +443,7 @@ public class MavenCli
         {
             commandLineBuilder.addArg( arg );
         }
-        
+
         // now add all options, except for -D with cli first then config file
         List<Option> setPropertyOptions = new ArrayList<>();
         for ( Option opt : mavenArgs.getOptions() )
@@ -515,7 +515,7 @@ public class MavenCli
         {
             MessageUtils.setColorEnabled( false );
         }
-        
+
         // LOG STREAMS
         if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
         {
@@ -1008,7 +1008,7 @@ public class MavenCli
             {
                 slf4jLogger.error( "" );
                 slf4jLogger.error( "After correcting the problems, you can resume the build with the command" );
-                slf4jLogger.error( buffer().a( "  " ).strong( "mvn <goals> -rf "
+                slf4jLogger.error( buffer().a( "  " ).strong( "mvn <args> -rf "
                     + getResumeFrom( result.getTopologicallySortedProjects(), project ) ).toString() );
             }
 
@@ -1092,7 +1092,7 @@ public class MavenCli
 
         for ( int i = 0; i < lines.length; i++ )
         {
-            // add eventual current color inherited from previous line 
+            // add eventual current color inherited from previous line
             String line = currentColor + lines[i];
 
             // look for last ANSI escape sequence to check if nextColor
@@ -1650,7 +1650,7 @@ public class MavenCli
         if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
         {
             String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );
-            
+
             if ( defStrs != null )
             {
                 for ( String defStr : defStrs )