Fixes

apache · Jan 8, 2025 · dc84751 · dc84751
1 parent f04fc52
commit dc84751
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...aven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/...aven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1003,8 +1003,11 @@ private ModelSource getParentPomFile(Model childModel, ModelSource source) {
         }
 
         String parentPath = childModel.getParent().getRelativePath();
+        if (parentPath == null) {
+            parentPath = "../pom.xml";
+        }
 
-        if (parentPath == null || parentPath.length() <= 0) {
+        if (parentPath.length() <= 0) {
             return null;
         }
 

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -54,7 +54,7 @@ public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exce
         verifier.setAutoclean(false);
 
         verifier.addCliArgument("-Drevision=1.2");
-        verifier.addCliArgument("-Dmaven.consumerpom=false");
+        verifier.addCliArgument("-Dmaven.consumer.pom=false");
         verifier.setLogFileName("install-log.txt");
         verifier.addCliArguments("clean", "install");
         verifier.execute();
@@ -80,7 +80,7 @@ public void testitShouldResolveTheDependenciesWithBuildConsumer() throws Excepti
         verifier.setForkJvm(true); // TODO: why?
 
         verifier.addCliArgument("-Drevision=1.2");
-        verifier.addCliArgument("-Dmaven.consumerpom=true");
+        verifier.addCliArgument("-Dmaven.consumer.pom=true");
         verifier.setLogFileName("install-log.txt");
         verifier.addCliArguments("clean", "install");
         verifier.execute();