Skip to content

Commit

Permalink
[MNG-6747] Generalize 'resume from' message when build reactor fails
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-o committed Aug 27, 2019
1 parent a52e2ea commit 400e7e5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ void cli( CliRequest cliRequest )
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() )
{
Expand All @@ -443,7 +443,7 @@ private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
{
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() )
Expand Down Expand Up @@ -515,7 +515,7 @@ else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE )
{
MessageUtils.setColorEnabled( false );
}

// LOG STREAMS
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
{
Expand Down Expand Up @@ -1008,7 +1008,7 @@ private int execute( CliRequest cliRequest )
{
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() );
}

Expand Down Expand Up @@ -1092,7 +1092,7 @@ private void logSummary( ExceptionSummary summary, Map<String, String> reference

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
Expand Down Expand Up @@ -1650,7 +1650,7 @@ static void populateProperties( CommandLine commandLine, Properties systemProper
if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
{
String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );

if ( defStrs != null )
{
for ( String defStr : defStrs )
Expand Down

0 comments on commit 400e7e5

Please sign in to comment.