[MNG-8327] Failure when building the consumer POM

apache · Oct 18, 2024 · 9b407d5 · 9b407d5
1 parent 2f7b962
commit 9b407d5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -323,7 +323,12 @@ class BuildSession implements AutoCloseable {
                     RepositoryUtils.overlay(request.getLocalRepository(), request.getRepositorySession(), repoSystem);
             InternalSession iSession = InternalSession.from(session);
             this.modelBuilderSession = modelBuilder.newSession();
-            iSession.getData().set(SessionData.key(ModelBuilder.ModelBuilderSession.class), modelBuilderSession);
+            // Save the ModelBuilderSession for later retrieval by the DefaultConsumerPomBuilder.
+            // Use replace(key, null, value) to make sure the *main* session, i.e. the one used
+            // to load the projects, is stored. This is to avoid the session being overwritten
+            // if a plugin uses the ProjectBuilder.
+            iSession.getData()
+                    .replace(SessionData.key(ModelBuilder.ModelBuilderSession.class), null, modelBuilderSession);
         }
 
         @Override