[MINVOKER-303] Print build summary at the end after logs

slawekjaranowski · slawekjaranowski · commit 2e02ca59ba11 · 2022-05-17T21:01:30.000+02:00
diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerMojo.java
@@ -68,14 +68,14 @@ public class InvokerMojo
     void processResults( InvokerSession invokerSession )
         throws MojoFailureException
     {
-        if ( !suppressSummaries )
+        if ( streamLogsOnFailures )
         {
-            invokerSession.logSummary( getLog(), ignoreFailures );
+            invokerSession.logFailedBuildLog( getLog(), ignoreFailures );
         }
 
-        if ( streamLogsOnFailures )
+        if ( !suppressSummaries )
         {
-            invokerSession.logFailedBuildLog( getLog(), ignoreFailures );
+            invokerSession.logSummary( getLog(), ignoreFailures );
         }
 
         invokerSession.handleFailures( getLog(), ignoreFailures );
diff --git a/src/main/java/org/apache/maven/plugins/invoker/InvokerSession.java b/src/main/java/org/apache/maven/plugins/invoker/InvokerSession.java
@@ -219,6 +219,8 @@ public void logSummary( Log logger, boolean ignoreFailures )
     public void logFailedBuildLog( Log logger, boolean ignoreFailures )
             throws MojoFailureException
     {
+        updateStats();
+
         List<BuildJob> jobToLogs = new ArrayList<>( failedJobs );
         jobToLogs.addAll( errorJobs );
 
diff --git a/src/main/java/org/apache/maven/plugins/invoker/VerifyMojo.java b/src/main/java/org/apache/maven/plugins/invoker/VerifyMojo.java
@@ -140,14 +140,14 @@ public void execute()
             }
         }
 
-        if ( !suppressSummaries )
+        if ( streamLogsOnFailures )
         {
-            invokerSession.logSummary( getLog(), ignoreFailures );
+            invokerSession.logFailedBuildLog( getLog(), ignoreFailures );
         }
 
-        if ( streamLogsOnFailures )
+        if ( !suppressSummaries )
         {
-            invokerSession.logFailedBuildLog( getLog(), ignoreFailures );
+            invokerSession.logSummary( getLog(), ignoreFailures );
         }
 
         invokerSession.handleFailures( getLog(), ignoreFailures );

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,14 @@ public class InvokerMojo`
`68`	`68`	`void processResults( InvokerSession invokerSession )`
`69`	`69`	`throws MojoFailureException`
`70`	`70`	`{`
`71`		`- if ( !suppressSummaries )`
	`71`	`+ if ( streamLogsOnFailures )`
`72`	`72`	`{`
`73`		`- invokerSession.logSummary( getLog(), ignoreFailures );`
	`73`	`+ invokerSession.logFailedBuildLog( getLog(), ignoreFailures );`
`74`	`74`	`}`
`75`	`75`
`76`		`- if ( streamLogsOnFailures )`
	`76`	`+ if ( !suppressSummaries )`
`77`	`77`	`{`
`78`		`- invokerSession.logFailedBuildLog( getLog(), ignoreFailures );`
	`78`	`+ invokerSession.logSummary( getLog(), ignoreFailures );`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`invokerSession.handleFailures( getLog(), ignoreFailures );`
Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,8 @@ public void logSummary( Log logger, boolean ignoreFailures )`
`219`	`219`	`public void logFailedBuildLog( Log logger, boolean ignoreFailures )`
`220`	`220`	`throws MojoFailureException`
`221`	`221`	`{`
	`222`	`+ updateStats();`
	`223`	`+`
`222`	`224`	`List<BuildJob> jobToLogs = new ArrayList<>( failedJobs );`
`223`	`225`	`jobToLogs.addAll( errorJobs );`
`224`	`226`
Original file line number	Diff line number	Diff line change
`@@ -140,14 +140,14 @@ public void execute()`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`- if ( !suppressSummaries )`
	`143`	`+ if ( streamLogsOnFailures )`
`144`	`144`	`{`
`145`		`- invokerSession.logSummary( getLog(), ignoreFailures );`
	`145`	`+ invokerSession.logFailedBuildLog( getLog(), ignoreFailures );`
`146`	`146`	`}`
`147`	`147`
`148`		`- if ( streamLogsOnFailures )`
	`148`	`+ if ( !suppressSummaries )`
`149`	`149`	`{`
`150`		`- invokerSession.logFailedBuildLog( getLog(), ignoreFailures );`
	`150`	`+ invokerSession.logSummary( getLog(), ignoreFailures );`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`invokerSession.handleFailures( getLog(), ignoreFailures );`