no need to check for Java5 anymore
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e0f845f8 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e0f845f8 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e0f845f8 Branch: refs/heads/master Commit: e0f845f8cf73dbcacc42a879fcee7aa96764829e Parents: 744c8f0 Author: Stefan Bodewig <[email protected]> Authored: Fri Feb 13 06:45:19 2015 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Fri Feb 13 06:45:19 2015 +0100 ---------------------------------------------------------------------- src/tests/antunit/taskdefs/javac-test.xml | 4 ++-- src/tests/antunit/taskdefs/optional/junit/junit-test.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/e0f845f8/src/tests/antunit/taskdefs/javac-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml index 4e845c6..3c4d848 100644 --- a/src/tests/antunit/taskdefs/javac-test.xml +++ b/src/tests/antunit/taskdefs/javac-test.xml @@ -220,7 +220,7 @@ public class Adapter implements CompilerAdapter { <mkdir dir="${javac-dir}/classes"/> </sequential> - <sequential if:set="jdk1.5+" unless:set="jdk1.9+"> + <sequential unless:set="jdk1.9+"> <echo>JDK 1.5+</echo> <testJavac source="1.5"/> <delete dir="${javac-dir}/classes"/> @@ -278,7 +278,7 @@ public class Adapter implements CompilerAdapter { <mkdir dir="${javac-dir}/classes"/> </sequential> - <sequential if:set="jdk1.5+" unless:set="jdk1.9+"> + <sequential unless:set="jdk1.9+"> <echo>JDK 1.5+</echo> <testJavac source="1.5" target="1.5"/> <delete dir="${javac-dir}/classes"/> http://git-wip-us.apache.org/repos/asf/ant/blob/e0f845f8/src/tests/antunit/taskdefs/optional/junit/junit-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml index 2043d8f..e6aa794 100644 --- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml +++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml @@ -316,7 +316,7 @@ public class BTest extends TestCase { </au:expectfailure> </target> - <target name="testTestMethods" if="jdk1.5+"> + <target name="testTestMethods"> <condition property="source" value="6"> <isset property="jdk1.6+"/> </condition>
