[FIXED JENKINS-16967] Allow environment variables in phing properties

jenkinsci · Mar 18, 2013 · 720a99e · 720a99e
1 parent 0c5382a
commit 720a99e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/phing/PhingBuilder.java b/src/main/java/hudson/plugins/phing/PhingBuilder.java
@@ -179,7 +179,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
 
         Set<String> sensitiveVars = build.getSensitiveBuildVariables();
         args.addKeyValuePairs("-D", build.getBuildVariables(), sensitiveVars);
-        args.addKeyValuePairsFromPropertyString("-D", properties, vr, sensitiveVars);
+        args.addKeyValuePairsFromPropertyString("-D", env.expand(properties), vr, sensitiveVars);
 
         String expandedOptions = Util.replaceMacro(env.expand(options), vr);
         if (expandedOptions == null || !expandedOptions.contains("-logger ")) {