apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-28 17:15:55 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Simplify the InterpolationHelper, use 'env.' to align with maven #676

Browse Source
This commit is contained in:
Guillaume Nodet
2022-08-30 11:30:15 +02:00
parent 8f9e59bab2
commit 0299a38264
2 changed files with 24 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
View File

@@ -454,8 +454,10 @@ public class DaemonParameters {
if (Files.exists(path)) {
try (InputStream in = Files.newInputStream(path)) {
result.load(in);
InterpolationHelper.performSubstitution((Map<String, String>) (Map) result,
new InterpolationHelper.SystemPropertiesSubstitutionCallback());
Properties sysProps = new Properties();
sysProps.putAll(System.getProperties());
System.getenv().forEach((k, v) -> sysProps.put(k, ENV_PREFIX + v));
InterpolationHelper.performSubstitution(result, sysProps::getProperty, true, true);
} catch (IOException e) {
throw new RuntimeException("Could not read " + path);
}