Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-8288] "path cannot be null" (#1782) 

It seems Maven is eager to get POM from rootDirectory to support
CI Friendly versions. This change makes it "best effort", as in
if there is no POM, just walk away.

---

https://issues.apache.org/jira/browse/MNG-8288
This commit is contained in:
Tamas Cservenak 2024-10-07 14:19:01 +02:00 committed by GitHub
parent 165588cbda
commit b2b868f864
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
View File

@ -1328,9 +1328,12 @@ public class DefaultModelBuilder implements ModelBuilder {
// defined on the root project. // defined on the root project.
Map<String, String> properties = new HashMap<>(); Map<String, String> properties = new HashMap<>();
if (!Objects.equals(rootDirectory, model.getProjectDirectory())) { if (!Objects.equals(rootDirectory, model.getProjectDirectory())) {
Model rootModel = derive(ModelSource.fromPath(modelProcessor.locateExistingPom(rootDirectory))) Path rootModelPath = modelProcessor.locateExistingPom(rootDirectory);
.readFileModel(); if (rootModelPath != null) {
properties.putAll(rootModel.getProperties()); Model rootModel =
derive(ModelSource.fromPath(rootModelPath)).readFileModel();
properties.putAll(rootModel.getProperties());
}
} else { } else {
properties.putAll(model.getProperties()); properties.putAll(model.getProperties());
} }