diff options
author | Matt Benson <mbenson@apache.org> | 2022-02-24 14:35:48 -0600 |
---|---|---|
committer | Matt Benson <mbenson@apache.org> | 2022-02-24 14:35:48 -0600 |
commit | 3d83934603c1f9036ed548eda37a633f68077766 (patch) | |
tree | 3df1269e490512d93f58c3b581c4025cf6285b63 /src | |
parent | b354f7ac1b6a99bea50ac864f0104973b2f8b088 (diff) | |
download | ant-3d83934603c1f9036ed548eda37a633f68077766.tar.gz |
bind all effective properties to script* tasks/types
Diffstat (limited to 'src')
-rw-r--r-- | src/main/org/apache/tools/ant/util/ScriptRunnerBase.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java index f45988e0f..e9029eea9 100644 --- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java +++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java @@ -27,6 +27,8 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.util.HashMap; import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -332,8 +334,9 @@ public abstract class ScriptRunnerBase { */ public void bindToComponent(ProjectComponent component) { project = component.getProject(); - addBeans(project.getProperties()); - addBeans(project.getUserProperties()); + + addBeans(project.getPropertyNames().stream() + .collect(Collectors.toMap(Function.identity(), project::getProperty))); addBeans(project.getCopyOfTargets()); addBeans(project.getCopyOfReferences()); addBean("project", project); |