(maven) branch master updated: Fix reactor loading problems (#1497)

[gnodet]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7451585a19 Fix reactor loading problems (#1497)
7451585a19 is described below

commit 7451585a19f307cc60bf5f047db0661a66313475
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri May 3 10:48:38 2024 +0200

    Fix reactor loading problems (#1497)
---
 .../org/apache/maven/internal/impl/model/DefaultModelBuilder.java   | 6 ++----
 .../internal/transformation/impl/DefaultConsumerPomBuilder.java     | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git 
a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
 
b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
index 47ef58d451..b66f04d6d9 100644
--- 
a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
+++ 
b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
@@ -901,9 +901,7 @@ public class DefaultModelBuilder implements ModelBuilder {
 
         Parent parent = childModel.getParent();
         if (parent != null) {
-            if (request.isProjectBuild()) {
-                parentData = readParentLocally(childModel, childSource, 
request, problems);
-            }
+            parentData = readParentLocally(childModel, childSource, request, 
problems);
             if (parentData == null) {
                 parentData = readParentExternally(childModel, request, 
problems);
             }
@@ -1247,7 +1245,7 @@ public class DefaultModelBuilder implements ModelBuilder {
                 IMPORT,
                 () -> doLoadDependencyManagement(
                         model, request, problems, dependency, groupId, 
artifactId, version, importIds));
-        DependencyManagement importMgmt = 
importModel.getDependencyManagement();
+        DependencyManagement importMgmt = importModel != null ? 
importModel.getDependencyManagement() : null;
         if (importMgmt == null) {
             importMgmt = DependencyManagement.newInstance();
         }
diff --git 
a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
index 8fab6a84bf..e5d60bcc67 100644
--- 
a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
@@ -193,7 +193,7 @@ class DefaultConsumerPomBuilder implements 
ConsumerPomBuilder {
                 dependencyManagementImporter,
                 lifecycleBindingsInjector,
                 pluginConfigurationExpander,
-                null,
+                profileActivationFilePathInterpolator,
                 modelTransformer,
                 versionParser);
         ModelBuilderRequest.ModelBuilderRequestBuilder request = 
ModelBuilderRequest.builder();
@@ -216,8 +216,8 @@ class DefaultConsumerPomBuilder implements 
ConsumerPomBuilder {
                     .sorted()
                     .distinct()
                     .toList();
-            logger.info("ModelCache contains " + paths.size());
-            paths.forEach(s -> logger.info("    " + s));
+            logger.debug("ModelCache contains " + paths.size());
+            paths.forEach(s -> logger.debug("    " + s));
         }
         return modelBuilder.build(request.build());
     }