You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/04/26 16:25:36 UTC
ant git commit: bad merge
Repository: ant
Updated Branches:
refs/heads/master 6a9d70120 -> 2a7b1b598
bad merge
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2a7b1b59
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2a7b1b59
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2a7b1b59
Branch: refs/heads/master
Commit: 2a7b1b598742bee3e18b8bc2a8624d4f222eac1e
Parents: 6a9d701
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Apr 26 18:25:04 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Apr 26 18:25:23 2018 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/Property.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/2a7b1b59/src/main/org/apache/tools/ant/taskdefs/Property.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index 1cfd268..3178796 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -511,7 +511,7 @@ public class Property extends Task {
}
} else {
if (url == null && file == null && resource == null
- && env == null) {
+ && env == null && runtime == null) {
throw new BuildException(
"You must specify url, file, resource, environment or runtime when not using the name attribute",
getLocation());