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 2016/07/25 10:26:45 UTC
[2/4] ant git commit: detect Java 9 via jigsaw
detect Java 9 via jigsaw
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/dda54c69
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/dda54c69
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/dda54c69
Branch: refs/heads/master
Commit: dda54c698d6c7d0dc9c39a102b5d1ac1f2550a3d
Parents: 7c3db4a
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Jul 25 12:21:18 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jul 25 12:21:18 2016 +0200
----------------------------------------------------------------------
build.xml | 4 +---
src/tests/antunit/antunit-base.xml | 4 +---
src/tests/antunit/taskdefs/javac-test.xml | 20 ++++++++++----------
.../taskdefs/optional/native2ascii-test.xml | 4 ++--
4 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/dda54c69/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a502536..eba9fc8 100644
--- a/build.xml
+++ b/build.xml
@@ -378,9 +378,7 @@
<available property="jdk1.6+" classname="java.net.CookieStore"/>
<available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
<available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
- <condition property="jdk1.9+">
- <contains string="${java.version}" substring="1.9."/>
- </condition>
+ <available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>
<available property="kaffe" classname="kaffe.util.NotImplemented"/>
<available property="harmony"
classname="org.apache.harmony.luni.util.Base64"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/dda54c69/src/tests/antunit/antunit-base.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index 80b289c..9863f3f 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -27,9 +27,7 @@
<property name="test3.jar" location="${antunit.tmpdir}/test3.jar"/>
<property name="test4.jar" location="${antunit.tmpdir}/test4.jar"/>
<property name="test5.jar" location="${antunit.tmpdir}/test5.jar"/>
- <condition property="jdk1.9+">
- <contains string="${java.version}" substring="1.9."/>
- </condition>
+ <available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>
<available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
<available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
<available property="jdk1.6+" classname="java.net.CookieStore"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/dda54c69/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 3c4d848..de193ea 100644
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@ -213,14 +213,14 @@ public class Adapter implements CompilerAdapter {
<testJavac source="notValid"/>
</au:expectfailure>
- <sequential unless:set="jdk1.9+">
+ <sequential unless:set="jdk9+">
<echo>JDK 1.4+</echo>
<testJavac source="1.4"/>
<delete dir="${javac-dir}/classes"/>
<mkdir dir="${javac-dir}/classes"/>
</sequential>
- <sequential unless:set="jdk1.9+">
+ <sequential unless:set="jdk9+">
<echo>JDK 1.5+</echo>
<testJavac source="1.5"/>
<delete dir="${javac-dir}/classes"/>
@@ -248,9 +248,9 @@ public class Adapter implements CompilerAdapter {
<mkdir dir="${javac-dir}/classes"/>
</sequential>
- <sequential if:set="jdk1.9+">
- <echo>JDK 1.9+</echo>
- <testJavac source="1.9"/>
+ <sequential if:set="jdk9+">
+ <echo>JDK 9+</echo>
+ <testJavac source="9"/>
<delete dir="${javac-dir}/classes"/>
<mkdir dir="${javac-dir}/classes"/>
</sequential>
@@ -271,14 +271,14 @@ public class Adapter implements CompilerAdapter {
<testJavac target="notValid"/>
</au:expectfailure>
- <sequential unless:set="jdk1.9+">
+ <sequential unless:set="jdk9+">
<echo>JDK 1.4+</echo>
<testJavac source="1.4" target="1.4"/>
<delete dir="${javac-dir}/classes"/>
<mkdir dir="${javac-dir}/classes"/>
</sequential>
- <sequential unless:set="jdk1.9+">
+ <sequential unless:set="jdk9+">
<echo>JDK 1.5+</echo>
<testJavac source="1.5" target="1.5"/>
<delete dir="${javac-dir}/classes"/>
@@ -306,9 +306,9 @@ public class Adapter implements CompilerAdapter {
<mkdir dir="${javac-dir}/classes"/>
</sequential>
- <sequential if:set="jdk1.9+">
- <echo>JDK 1.9+</echo>
- <testJavac source="1.9" target="1.9"/>
+ <sequential if:set="jdk9+">
+ <echo>JDK 9+</echo>
+ <testJavac source="9" target="9"/>
<delete dir="${javac-dir}/classes"/>
<mkdir dir="${javac-dir}/classes"/>
</sequential>
http://git-wip-us.apache.org/repos/asf/ant/blob/dda54c69/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
index be521de..560ead3 100644
--- a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
+++ b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
@@ -97,7 +97,7 @@ public class Adapter implements Native2AsciiAdapter {
<target name="testUTF8-To-ASCII-sun" depends="-setup-UTF8-To-ASCII"
description="https://bz.apache.org/bugzilla/show_bug.cgi?id=59855"
- unless="jdk1.9+">
+ unless="jdk9+">
<native2ascii-def implementation="sun"/>
<assertTranslatedOutput file="umlauts.properties" encoding="ASCII"
expected="${umlauts.expected}"/>
@@ -119,7 +119,7 @@ public class Adapter implements Native2AsciiAdapter {
<target name="testASCII-To-UTF8-sun" depends="-setup-ASCII-To-UTF8"
description="https://bz.apache.org/bugzilla/show_bug.cgi?id=59855"
- unless="jdk1.9+">
+ unless="jdk9+">
<native2ascii-def implementation="sun" reverse="true"/>
<assertTranslatedOutput file="umlauts.properties" encoding="UTF-8"
expected="${umlauts.expected}"/>