Skip to content

fix: interpolate properties in module/subproject path before filesystem resolution #12734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −0
Open

fix: interpolate properties in module/subproject path before filesystem resolution #12734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,25 @@ private void loadFilePom(
continue;
}

// MNG-XXXX: interpolate properties in the subproject/module path (e.g.
// <module>./../module/pom${version-discriminator}.xml</module>) before
// resolving it against the filesystem. Model-wide interpolation happens
// later in the build, but module paths must be resolved here, so we
// interpolate just the path against the model, user and system properties.
String interpolated = interpolator.interpolate(subproject, key -> {
String value = activated.getProperties().get(key);
if (value == null) {
value = request.getUserProperties().get(key);
}
if (value == null) {
value = request.getSystemProperties().get(key);
}
return value;
});
if (interpolated != null) {
subproject = interpolated;
}

subproject = subproject.replace('\\', File.separatorChar).replace('/', File.separatorChar);

Path rawSubprojectFile = modelProcessor.locateExistingPom(pomDirectory.resolve(subproject));
Expand Down