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

Resume from generates misleading hint when multiple projects fail. 

Log the topologically sorted first failed project instead of the chronologically first failed project.
Resume from generates misleading hint when multiple projects fail.
Fixed a checkstyle finding.
Removed a trailing space in the -r hint
This commit is contained in:
Martin Kanters 2020-04-21 14:56:27 +02:00 committed by Maarten Mulders
parent 4f193b3fc2
commit 5739b12aa9
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,6 +115,7 @@ import java.util.StringTokenizer;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static java.util.Comparator.comparing;
import static org.apache.maven.cli.ResolveFile.resolveFile; import static org.apache.maven.cli.ResolveFile.resolveFile;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@ -986,7 +987,7 @@ public class MavenCli
Map<String, String> references = new LinkedHashMap<>(); Map<String, String> references = new LinkedHashMap<>();
MavenProject project = null; List<MavenProject> failedProjects = new ArrayList<>();
for ( Throwable exception : result.getExceptions() ) for ( Throwable exception : result.getExceptions() )
{ {
@ -994,10 +995,9 @@ public class MavenCli
logSummary( summary, references, "", cliRequest.showErrors ); logSummary( summary, references, "", cliRequest.showErrors );
if ( project == null && exception instanceof LifecycleExecutionException ) if ( exception instanceof LifecycleExecutionException )
{ {
LifecycleExecutionException lifecycleExecutionException = (LifecycleExecutionException) exception; failedProjects.add ( ( (LifecycleExecutionException) exception ).getProject() );
project = lifecycleExecutionException.getProject();
} }
} }
@ -1026,16 +1026,24 @@ public class MavenCli
} }
} }
List<MavenProject> sortedProjects = result.getTopologicallySortedProjects();
if ( result.canResume() ) if ( result.canResume() )
{ {
logBuildResumeHint( "mvn <args> -r " ); logBuildResumeHint( "mvn <args> -r" );
} }
else if ( project != null && !project.equals( sortedProjects.get( 0 ) ) ) else if ( !failedProjects.isEmpty() )
{ {
String resumeFromSelector = getResumeFromSelector( sortedProjects, project ); List<MavenProject> sortedProjects = result.getTopologicallySortedProjects();
// Sort the failedProjects list in the topologically sorted order.
failedProjects.sort( comparing( sortedProjects::indexOf ) );
MavenProject firstFailedProject = failedProjects.get( 0 );
if ( !firstFailedProject.equals( sortedProjects.get( 0 ) ) )
{
String resumeFromSelector = getResumeFromSelector( sortedProjects, firstFailedProject );
logBuildResumeHint( "mvn <args> -rf " + resumeFromSelector ); logBuildResumeHint( "mvn <args> -rf " + resumeFromSelector );
} }
}
if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) ) if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) )
{ {
@ -1074,22 +1082,22 @@ public class MavenCli
* This method is made package-private for testing purposes. * This method is made package-private for testing purposes.
* *
* @param mavenProjects Maven projects which are part of build execution. * @param mavenProjects Maven projects which are part of build execution.
* @param failedProject Project which has failed. * @param firstFailedProject The first project which has failed.
* @return Value for -rf flag to resume build exactly from place where it failed ({@code :artifactId} in general * @return Value for -rf flag to resume build exactly from place where it failed ({@code :artifactId} in general
* and {@code groupId:artifactId} when there is a name clash). * and {@code groupId:artifactId} when there is a name clash).
*/ */
String getResumeFromSelector( List<MavenProject> mavenProjects, MavenProject failedProject ) String getResumeFromSelector( List<MavenProject> mavenProjects, MavenProject firstFailedProject )
{ {
boolean hasOverlappingArtifactId = mavenProjects.stream() boolean hasOverlappingArtifactId = mavenProjects.stream()
.filter( project -> failedProject.getArtifactId().equals( project.getArtifactId() ) ) .filter( project -> firstFailedProject.getArtifactId().equals( project.getArtifactId() ) )
.count() > 1; .count() > 1;
if ( hasOverlappingArtifactId ) if ( hasOverlappingArtifactId )
{ {
return failedProject.getGroupId() + ":" + failedProject.getArtifactId(); return firstFailedProject.getGroupId() + ":" + firstFailedProject.getArtifactId();
} }
return ":" + failedProject.getArtifactId(); return ":" + firstFailedProject.getArtifactId();
} }
private void logSummary( ExceptionSummary summary, Map<String, String> references, String indent, private void logSummary( ExceptionSummary summary, Map<String, String> references, String indent,