mirror of https://github.com/apache/maven.git
[MNG-6747] Generalize 'resume from' message when build reactor fails
This commit is contained in:
parent
a52e2ea44a
commit
400e7e5979
|
@ -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() )
|
||||
{
|
||||
|
@ -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() )
|
||||
|
@ -515,7 +515,7 @@ else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE )
|
|||
{
|
||||
MessageUtils.setColorEnabled( false );
|
||||
}
|
||||
|
||||
|
||||
// LOG STREAMS
|
||||
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
|
||||
{
|
||||
|
@ -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() );
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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 )
|
||||
|
|
Loading…
Reference in New Issue