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/14 07:32:44 UTC
[2/2] ant git commit: even more places where -source needed a newer
version on 1.9
even more places where -source needed a newer version on 1.9
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e6ab6987
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e6ab6987
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e6ab6987
Branch: refs/heads/master
Commit: e6ab69873a3e8b235d66873c9715132f25dfde4c
Parents: 15d585e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 14 07:32:03 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 14 07:32:03 2015 +0100
----------------------------------------------------------------------
src/etc/testcases/core/antclassloader.xml | 7 ++++++-
src/etc/testcases/taskdefs/optional/junit.xml | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e6ab6987/src/etc/testcases/core/antclassloader.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/core/antclassloader.xml b/src/etc/testcases/core/antclassloader.xml
index 5e138da..cafc823 100644
--- a/src/etc/testcases/core/antclassloader.xml
+++ b/src/etc/testcases/core/antclassloader.xml
@@ -56,8 +56,13 @@
package org.example;
public class Foo {}
]]></echo>
+ <available property="jdk1.6+" classname="java.net.CookieStore"/>
+ <condition property="source" value="6">
+ <isset property="jdk1.6+"/>
+ </condition>
+ <property name="source" value="1.4"/>
<javac srcdir="${tmp.dir.nonascii}"
- destdir="${tmp.dir.nonascii}" source="1.4"/>
+ destdir="${tmp.dir.nonascii}" source="${source}"/>
<tempfile property="test.jar" destdir="${tmp.dir}" suffix="test" prefix=".jar" deleteonexit="true"/>
<jar destfile="${test.jar}">
<fileset dir="${tmp.dir.nonascii}" includes="**/*.class"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/e6ab6987/src/etc/testcases/taskdefs/optional/junit.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml
index d976abf..82f2d44 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -339,7 +339,13 @@
public void bad() {
throw new RuntimeException("failed");}
}</echo>
- <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java" source="5">
+ <available property="jdk1.6+" classname="java.net.CookieStore"/>
+ <condition property="source" value="6">
+ <isset property="jdk1.6+"/>
+ </condition>
+ <property name="source" value="1.4"/>
+ <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java"
+ source="${source}">
</javac>
<junit fork="false" printsummary="true" haltonerror="true">