Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6c032e68 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6c032e68 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6c032e68 Branch: refs/heads/master Commit: 6c032e687dc5db46e199bb17856dfb7a91ad48a3 Parents: 81c3e6e 38a22b0 Author: Stefan Bodewig <bode...@apache.org> Authored: Sat Apr 14 18:56:07 2018 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Sat Apr 14 18:56:07 2018 +0200 ---------------------------------------------------------------------- src/tests/antunit/core/location/location.xml | 2 +- .../taskdefs/optional/junit/junit-outputtoformatters-test.xml | 2 +- src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 2 +- src/tests/antunit/taskdefs/taskdef-test.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/6c032e68/src/tests/antunit/taskdefs/taskdef-antlib-test.xml ---------------------------------------------------------------------- diff --cc src/tests/antunit/taskdefs/taskdef-antlib-test.xml index 72f21ae,b03911e..a201603 --- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml +++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml @@@ -18,9 -18,11 +18,9 @@@ <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> <import file="../antunit-base.xml" /> - <!-- Java5 has some trouble with the recursive Antlib lookup --> - - <target name="setUp" if="jdk1.6+"> + <target name="setUp"> <mkdir dir="${input}/org/example" /> - <property name="tmpdir" location="../../../../build/ant-unit/taskdef" /> + <property name="tmpdir" location="../../../../build/antunit/taskdef" /> <mkdir dir="${tmpdir}" /> <echo file="${input}/org/example/antlib.xml"> <