[maven] 03/03: [MNG-7788] Plugin Validation Report logged before summary (#1114)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 099a3f346cf905face0cfaed0e3f93dacbe2c6ff
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri May 19 17:47:32 2023 +0200

    [MNG-7788] Plugin Validation Report logged before summary (#1114)
    
    This change uses different technique to hook into "session end", and thus 
is invoked before ExecutionEventLogger is.
    
    ---
    
    https://issues.apache.org/jira/browse/MNG-7788
---
 .../plugin/internal/DefaultPluginValidationManager.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
index 371abb12a..f158f0341 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
@@ -29,7 +29,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.maven.AbstractMavenLifecycleParticipant;
+import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.InputLocation;
 import org.apache.maven.plugin.PluginValidationManager;
@@ -44,8 +45,7 @@ import org.slf4j.LoggerFactory;
 
 @Singleton
 @Named
-public final class DefaultPluginValidationManager extends 
AbstractMavenLifecycleParticipant
-        implements PluginValidationManager {
+public final class DefaultPluginValidationManager extends AbstractEventSpy 
implements PluginValidationManager {
 
     private static final String ISSUES_KEY = 
DefaultPluginValidationManager.class.getName() + ".issues";
 
@@ -62,8 +62,13 @@ public final class DefaultPluginValidationManager extends 
AbstractMavenLifecycle
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Override
-    public void afterSessionEnd(MavenSession session) {
-        reportSessionCollectedValidationIssues(session);
+    public void onEvent(Object event) {
+        if (event instanceof ExecutionEvent) {
+            ExecutionEvent executionEvent = (ExecutionEvent) event;
+            if (executionEvent.getType() == ExecutionEvent.Type.SessionEnded) {
+                
reportSessionCollectedValidationIssues(executionEvent.getSession());
+            }
+        }
     }
 
     private ValidationReportLevel 
validationReportLevel(RepositorySystemSession session) {