[MNG-5760] Add --resume / -r switch

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -366,20 +366,21 @@ private void afterSessionEnd( Collection<MavenProject> projects, MavenSession se
 
     private void saveResumptionDataWhenApplicable( MavenExecutionResult result, MavenSession session )
     {
-        List<LifecycleExecutionException> lifecycleExecutionExceptions = result.getExceptions().stream()
+        long lifecycleExecutionExceptionCount = result.getExceptions().stream()
                 .filter( LifecycleExecutionException.class::isInstance )
-                .map( LifecycleExecutionException.class::cast )
-                .collect( Collectors.toList() );
+                .count();
 
-        if ( !lifecycleExecutionExceptions.isEmpty() )
+        if ( lifecycleExecutionExceptionCount > 0 )
         {
             session.getAllProjects().stream()
                     .filter( MavenProject::isExecutionRoot )
                     .findFirst()
                     .ifPresent( rootProject ->
                     {
-                        boolean persisted = buildResumptionManager.persistResumptionData( result, rootProject );
-                        lifecycleExecutionExceptions.forEach( e -> e.setBuildResumptionDataSaved( persisted ) );
+                        if ( buildResumptionManager.persistResumptionData( result, rootProject ) )
+                        {
+                            result.setResumptionDataStored();
+                        }
                     } );
         }
     }

maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java

@@ -43,6 +43,8 @@ public class DefaultMavenExecutionResult
     private final Map<MavenProject, BuildSummary> buildSummaries =
         Collections.synchronizedMap( new IdentityHashMap<>() );
 
+    private boolean resumptionDataStored = false;
+
     public MavenExecutionResult setProject( MavenProject project )
     {
         this.project = project;
@@ -108,4 +110,16 @@ public void addBuildSummary( BuildSummary summary )
     {
         buildSummaries.put( summary.getProject(), summary );
     }
+
+    @Override
+    public boolean isResumptionDataStored()
+    {
+        return resumptionDataStored;
+    }
+
+    @Override
+    public void setResumptionDataStored()
+    {
+        this.resumptionDataStored = true;
+    }
 }

maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java

@@ -67,4 +67,18 @@ public interface MavenExecutionResult
      * @param summary The build summary to add, must not be {@code null}.
      */
     void addBuildSummary( BuildSummary summary );
+
+    /**
+     * Indicates whether or not resumption data has been stored.
+     * @see org.apache.maven.execution.BuildResumptionManager
+     * @return <code>true</code> when it is possible to resume the build, <code>false</code> otherwise.
+     */
+    boolean isResumptionDataStored();
+
+    /**
+     * Indicate that resumption data has been stored.
+     * @see org.apache.maven.execution.BuildResumptionManager
+     * @see #isResumptionDataStored()
+     */
+    void setResumptionDataStored();
 }

maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java

@@ -33,8 +33,6 @@ public class LifecycleExecutionException
 {
     private MavenProject project;
 
-    private boolean buildResumptionDataSaved = false;
-
     public LifecycleExecutionException( String message )
     {
         super( message );
@@ -78,16 +76,6 @@ public MavenProject getProject()
         return project;
     }
 
-    public boolean isBuildResumptionDataSaved()
-    {
-        return buildResumptionDataSaved;
-    }
-
-    public void setBuildResumptionDataSaved( boolean isBuildResumptionDataSaved )
-    {
-        this.buildResumptionDataSaved = isBuildResumptionDataSaved;
-    }
-
     private static String createMessage( MojoExecution execution, MavenProject project, Throwable cause )
     {
         MessageBuilder buffer = buffer( 256 );

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

@@ -992,7 +992,6 @@ private int execute( CliRequest cliRequest )
             Map<String, String> references = new LinkedHashMap<>();
 
             MavenProject project = null;
-            boolean isResumptionDataSaved = false;
 
             for ( Throwable exception : result.getExceptions() )
             {
@@ -1004,7 +1003,6 @@ private int execute( CliRequest cliRequest )
                 {
                     LifecycleExecutionException lifecycleExecutionException = (LifecycleExecutionException) exception;
                     project = lifecycleExecutionException.getProject();
-                    isResumptionDataSaved = lifecycleExecutionException.isBuildResumptionDataSaved();
                 }
             }
 
@@ -1034,7 +1032,7 @@ private int execute( CliRequest cliRequest )
             }
 
             List<MavenProject> sortedProjects = result.getTopologicallySortedProjects();
-            if ( isResumptionDataSaved )
+            if ( result.isResumptionDataStored() )
             {
                 logBuildResumeHint( "mvn <args> -r " );
             }