[MNG-7433] Fix deadlock during forked lifecycle executions

apache · May 29, 2022 · 8ffe982 · 8ffe982
1 parent 88a03f8
commit 8ffe982
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -206,10 +206,7 @@ private void execute( MavenSession session, MojoExecution mojoExecution, Project
             }
         }
 
-        try ( ProjectLock lock = new ProjectLock( session, mojoDescriptor, aggregatorLock ) )
-        {
-            doExecute( session, mojoExecution, projectIndex, dependencyContext );
-        }
+        doExecute( session, mojoExecution, projectIndex, dependencyContext );
     }
 
     /**
@@ -292,8 +289,31 @@ private void doExecute( MavenSession session, MojoExecution mojoExecution, Proje
 
         ensureDependenciesAreResolved( mojoDescriptor, session, dependencyContext );
 
-        eventCatapult.fire( ExecutionEvent.Type.MojoStarted, session, mojoExecution );
+        try
+        {
+            mojos.put( Thread.currentThread(), mojoDescriptor );
+            try ( ProjectLock lock = new ProjectLock( session, mojoDescriptor ) )
+            {
+                doExecute2( session, mojoExecution );
+            }
+            finally
+            {
+                mojos.remove( Thread.currentThread() );
+            }
+        }
+        finally
+        {
+            for ( MavenProject forkedProject : forkedProjects )
+            {
+                forkedProject.setExecutionProject( null );
+            }
+        }
+    }
 
+    private void doExecute2( MavenSession session, MojoExecution mojoExecution )
+            throws LifecycleExecutionException
+    {
+        eventCatapult.fire( ExecutionEvent.Type.MojoStarted, session, mojoExecution );
         try
         {
             try
@@ -314,13 +334,6 @@ private void doExecute( MavenSession session, MojoExecution mojoExecution, Proje
 
             throw e;
         }
-        finally
-        {
-            for ( MavenProject forkedProject : forkedProjects )
-            {
-                forkedProject.setExecutionProject( null );
-            }
-        }
     }
 
     public void ensureDependenciesAreResolved( MojoDescriptor mojoDescriptor, MavenSession session,