Skip to content

Commit a3cb0d1

Browse files
committed
[MNG-8340] Resolve parent according to the exact model location
1 parent 4e1152f commit a3cb0d1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,12 @@ private static org.apache.maven.model.building.ModelProblem convert(ModelProblem
565565
@SuppressWarnings({"checkstyle:methodlength", "deprecation"})
566566
private void initProject(MavenProject project, ModelBuilderResult result) {
567567
project.setModel(new org.apache.maven.model.Model(result.getEffectiveModel()));
568-
project.setOriginalModel(new org.apache.maven.model.Model(result.getFileModel()));
568+
Model originalModel = result.getFileModel();
569+
if (originalModel.getParent() != null && originalModel.getParent().getRelativePath() == null) {
570+
originalModel =
571+
originalModel.withParent(originalModel.getParent().withRelativePath(".."));
572+
}
573+
project.setOriginalModel(new org.apache.maven.model.Model(originalModel));
569574

570575
initParent(project, result);
571576

0 commit comments

Comments
 (0)