From a8aab7db6c7baf1e626ff8ce48a321b771e4bf9d Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 12 Apr 2022 14:04:33 +0200
Subject: [PATCH 1/2] Attempt to use a single session

---
 .../org/apache/maven/execution/MavenSession.java | 16 ++++++++--------
 .../lifecycle/internal/BuildListCalculator.java  |  4 +---
 .../internal/LifecycleModuleBuilder.java         | 14 +++-----------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index 98c5573c9736..c067adfb312d 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -54,7 +54,7 @@ public class MavenSession
 
     private Properties executionProperties;
 
-    private MavenProject currentProject;
+    private InheritableThreadLocal<MavenProject> currentProject = new InheritableThreadLocal<>();
 
     /**
      * These projects have already been topologically sorted in the {@link org.apache.maven.Maven} component before
@@ -83,14 +83,14 @@ public void setProjects( List<MavenProject> projects )
     {
         if ( !projects.isEmpty() )
         {
-            this.currentProject = projects.get( 0 );
-            this.topLevelProject =
-                    projects.stream().filter( project -> project.isExecutionRoot() ).findFirst()
-                            .orElse( currentProject );
+            MavenProject prj = projects.get( 0 );
+            this.currentProject.set( prj );
+            this.topLevelProject = projects.stream().filter( project -> project.isExecutionRoot() ).findFirst()
+                            .orElse( prj );
         }
         else
         {
-            this.currentProject = null;
+            this.currentProject.set( null );
             this.topLevelProject = null;
         }
         this.projects = projects;
@@ -151,12 +151,12 @@ public MavenExecutionRequest getRequest()
 
     public void setCurrentProject( MavenProject currentProject )
     {
-        this.currentProject = currentProject;
+        this.currentProject.set( currentProject );
     }
 
     public MavenProject getCurrentProject()
     {
-        return currentProject;
+        return currentProject.get();
     }
 
     public ProjectBuildingRequest getProjectBuildingRequest()
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
index 4fef69b4a9c7..0e0262779c0f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
@@ -61,9 +61,7 @@ public ProjectBuildList calculateProjectBuilds( MavenSession session, List<TaskS
                 try
                 {
                     BuilderCommon.attachToThread( project ); // Not totally sure if this is needed for anything
-                    MavenSession copiedSession = session.clone();
-                    copiedSession.setCurrentProject( project );
-                    projectBuilds.add( new ProjectSegment( project, taskSegment, copiedSession ) );
+                    projectBuilds.add( new ProjectSegment( project, taskSegment, session ) );
                 }
                 finally
                 {
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
index 1cbaf5334606..97acde3f3472 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
@@ -88,13 +88,10 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto
 
         long buildStartTime = System.currentTimeMillis();
 
-        // session may be different from rootSession seeded in DefaultMaven
-        // explicitly seed the right session here to make sure it is used by Guice
-        final boolean scoped = session != rootSession;
-        if ( scoped )
+        if ( session != rootSession )
         {
-            sessionScope.enter();
-            sessionScope.seed( MavenSession.class, session );
+            // a single session is reused during the whole build
+            throw new UnsupportedOperationException();
         }
         try
         {
@@ -149,11 +146,6 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto
         }
         finally
         {
-            if ( scoped )
-            {
-                sessionScope.exit();
-            }
-
             session.setCurrentProject( null );
 
             Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() );

From 1f4e0a326466a0ca3789541baafbde968ddfe727 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 12 Apr 2022 19:53:34 +0200
Subject: [PATCH 2/2] Make executionProperties final

---
 .../org/apache/maven/execution/MavenSession.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index c067adfb312d..ec0a471a78a5 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -52,7 +52,7 @@ public class MavenSession
 
     private RepositorySystemSession repositorySession;
 
-    private Properties executionProperties;
+    private final Properties executionProperties;
 
     private InheritableThreadLocal<MavenProject> currentProject = new InheritableThreadLocal<>();
 
@@ -306,6 +306,9 @@ public MavenSession( PlexusContainer container, RepositorySystemSession reposito
         this.result = result;
         this.settings = new SettingsAdapter( request );
         this.repositorySession = repositorySession;
+        this.executionProperties = new Properties();
+        this.executionProperties.putAll( request.getSystemProperties() );
+        this.executionProperties.putAll( request.getUserProperties() );
     }
     
     @Deprecated
@@ -351,6 +354,9 @@ public MavenSession( PlexusContainer container, MavenExecutionRequest request, M
         this.request = request;
         this.result = result;
         this.settings = new SettingsAdapter( request );
+        this.executionProperties = new Properties();
+        this.executionProperties.putAll( request.getSystemProperties() );
+        this.executionProperties.putAll( request.getUserProperties() );
         setProjects( projects );
     }
 
@@ -388,13 +394,6 @@ public boolean isUsingPOMsFromFilesystem()
     @Deprecated
     public Properties getExecutionProperties()
     {
-        if ( executionProperties == null )
-        {
-            executionProperties = new Properties();
-            executionProperties.putAll( request.getSystemProperties() );
-            executionProperties.putAll( request.getUserProperties() );
-        }
-
         return executionProperties;
     }