Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6747] Generalize 'resume from' message when build reactor fails

This commit is contained in:
Michael Osipov 2019-08-27 09:08:57 +02:00
parent a52e2ea44a
commit 400e7e5979
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

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