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 2015/02/13 06:45:49 UTC
[2/4] ant git commit: Java9's javac doesn't support -source 1.5
anymore
Java9's javac doesn't support -source 1.5 anymore
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/7b88a658
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/7b88a658
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/7b88a658
Branch: refs/heads/master
Commit: 7b88a65814ea2aed5ac555587844fa8a12c2f95c
Parents: 1be3f9c
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Feb 13 06:41:42 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Feb 13 06:41:42 2015 +0100
----------------------------------------------------------------------
src/tests/antunit/taskdefs/javac-test.xml | 34 +++++++++++---------
.../taskdefs/optional/junit/junit-test.xml | 6 +++-
2 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/7b88a658/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 2827fa0..4e845c6 100644
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@ -198,7 +198,7 @@ public class Adapter implements CompilerAdapter {
<au:assertLogContains text="adapter called" />
</target>
- <target name="testSourceAttributes" xmlns:if="ant:if">
+ <target name="testSourceAttributes" xmlns:if="ant:if" xmlns:unless="ant:unless">
<delete dir="${javac-dir}/src" />
<mkdir dir="${javac-dir}/src" />
<mkdir dir="${javac-dir}/classes" />
@@ -212,13 +212,15 @@ public class Adapter implements CompilerAdapter {
<au:expectfailure>
<testJavac source="notValid"/>
</au:expectfailure>
-
- <echo>JDK 1.4+</echo>
- <testJavac source="1.4"/>
- <delete dir="${javac-dir}/classes"/>
- <mkdir dir="${javac-dir}/classes"/>
-
- <sequential if:set="jdk1.5+">
+
+ <sequential unless:set="jdk1.9+">
+ <echo>JDK 1.4+</echo>
+ <testJavac source="1.4"/>
+ <delete dir="${javac-dir}/classes"/>
+ <mkdir dir="${javac-dir}/classes"/>
+ </sequential>
+
+ <sequential if:set="jdk1.5+" unless:set="jdk1.9+">
<echo>JDK 1.5+</echo>
<testJavac source="1.5"/>
<delete dir="${javac-dir}/classes"/>
@@ -254,7 +256,7 @@ public class Adapter implements CompilerAdapter {
</sequential>
</target>
- <target name="testTargetAttributes" xmlns:if="ant:if">
+ <target name="testTargetAttributes" xmlns:if="ant:if" xmlns:unless="ant:unless">
<delete dir="${javac-dir}/src" />
<mkdir dir="${javac-dir}/src" />
<mkdir dir="${javac-dir}/classes" />
@@ -269,12 +271,14 @@ public class Adapter implements CompilerAdapter {
<testJavac target="notValid"/>
</au:expectfailure>
- <echo>JDK 1.4+</echo>
- <testJavac source="1.4" target="1.4"/>
- <delete dir="${javac-dir}/classes"/>
- <mkdir dir="${javac-dir}/classes"/>
-
- <sequential if:set="jdk1.5+">
+ <sequential unless:set="jdk1.9+">
+ <echo>JDK 1.4+</echo>
+ <testJavac source="1.4" target="1.4"/>
+ <delete dir="${javac-dir}/classes"/>
+ <mkdir dir="${javac-dir}/classes"/>
+ </sequential>
+
+ <sequential if:set="jdk1.5+" 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/7b88a658/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 873ce0e..2043d8f 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -317,6 +317,10 @@ public class BTest extends TestCase {
</target>
<target name="testTestMethods" if="jdk1.5+">
+ <condition property="source" value="6">
+ <isset property="jdk1.6+"/>
+ </condition>
+ <property name="source" value="5"/>
<echo file="${input}/T1.java">public class T1 extends
junit.framework.TestCase {
public void testOK() {}
@@ -331,7 +335,7 @@ public class BTest extends TestCase {
public void bad() {
throw new RuntimeException("failed");}
}</echo>
- <javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="5" includeantruntime="false">
+ <javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="${source}" includeantruntime="false">
<classpath>
<path refid="junit" />
</classpath>