diff options
| -rw-r--r-- | docs.xml | 2 | ||||
| -rw-r--r-- | src/etc/testcases/core/antclassloader.xml | 6 | ||||
| -rw-r--r-- | src/etc/testcases/taskdefs/optional/junit.xml | 6 | ||||
| -rw-r--r-- | src/etc/testcases/types/assertions.xml | 6 | ||||
| -rw-r--r-- | src/tests/antunit/antunit-base.xml | 4 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/javac-test.xml | 53 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/optional/junit/junit-test.xml | 5 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/secure-input.xml | 2 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 8 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/taskdef-test.xml | 2 | ||||
| -rw-r--r-- | src/tests/antunit/taskdefs/xslt-test.xml | 13 |
11 files changed, 12 insertions, 95 deletions
@@ -17,9 +17,7 @@ --> <project name="docs" default="txt2html"> - <available property="jdk1.5+" classname="java.net.Proxy"/> <target name="txt2html"> - <fail unless="jdk1.5+" message="Tomcat BuildUtils requires Java5+"/> <property name="build.dir" value="build"/> <tempfile property="temp.dir"/> <mkdir dir="${temp.dir}/org/apache/tomcat/buildutil"/> diff --git a/src/etc/testcases/core/antclassloader.xml b/src/etc/testcases/core/antclassloader.xml index cafc823b9..045428d22 100644 --- a/src/etc/testcases/core/antclassloader.xml +++ b/src/etc/testcases/core/antclassloader.xml @@ -56,11 +56,7 @@ 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"/> + <property name="source" value="8"/> <javac srcdir="${tmp.dir.nonascii}" destdir="${tmp.dir.nonascii}" source="${source}"/> <tempfile property="test.jar" destdir="${tmp.dir}" suffix="test" prefix=".jar" deleteonexit="true"/> diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml index cc66e20e5..314ba87c2 100644 --- a/src/etc/testcases/taskdefs/optional/junit.xml +++ b/src/etc/testcases/taskdefs/optional/junit.xml @@ -339,11 +339,7 @@ public void bad() { throw new RuntimeException("failed");} }</echo> - <available property="jdk1.6+" classname="java.net.CookieStore"/> - <condition property="source" value="6"> - <isset property="jdk1.6+"/> - </condition> - <property name="source" value="5"/> + <property name="source" value="8"/> <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java" source="${source}"> diff --git a/src/etc/testcases/types/assertions.xml b/src/etc/testcases/types/assertions.xml index dee7ce7c5..a849a0b94 100644 --- a/src/etc/testcases/types/assertions.xml +++ b/src/etc/testcases/types/assertions.xml @@ -21,11 +21,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <available property="jdk1.6+" classname="java.net.CookieStore"/> - <condition property="source" value="6"> - <isset property="jdk1.6+"/> - </condition> - <property name="source" value="1.4"/> + <property name="source" value="8"/> <mkdir dir="${output}"/> <javac srcdir="${src.dir}" includes="*.java" diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml index 80b289cac..da3930560 100644 --- a/src/tests/antunit/antunit-base.xml +++ b/src/tests/antunit/antunit-base.xml @@ -30,10 +30,6 @@ <condition property="jdk1.9+"> <contains string="${java.version}" substring="1.9."/> </condition> - <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"/> - <available property="jdk1.5+" classname="java.net.Proxy"/> <condition property="build.sysclasspath.only"> <equals arg1="${build.sysclasspath}" arg2="only"/> </condition> diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml index 3c4d84894..566c41783 100644 --- a/src/tests/antunit/taskdefs/javac-test.xml +++ b/src/tests/antunit/taskdefs/javac-test.xml @@ -221,33 +221,12 @@ public class Adapter implements CompilerAdapter { </sequential> <sequential unless:set="jdk1.9+"> - <echo>JDK 1.5+</echo> - <testJavac source="1.5"/> - <delete dir="${javac-dir}/classes"/> - <mkdir dir="${javac-dir}/classes"/> - </sequential> - - <sequential if:set="jdk1.6+"> - <echo>JDK 1.6+</echo> - <testJavac source="1.6"/> - <delete dir="${javac-dir}/classes"/> - <mkdir dir="${javac-dir}/classes"/> - </sequential> - - <sequential if:set="jdk1.7+"> - <echo>JDK 1.7+</echo> - <testJavac source="1.7"/> - <delete dir="${javac-dir}/classes"/> - <mkdir dir="${javac-dir}/classes"/> - </sequential> - - <sequential if:set="jdk1.8+"> <echo>JDK 1.8+</echo> <testJavac source="1.8"/> <delete dir="${javac-dir}/classes"/> <mkdir dir="${javac-dir}/classes"/> </sequential> - + <sequential if:set="jdk1.9+"> <echo>JDK 1.9+</echo> <testJavac source="1.9"/> @@ -272,40 +251,12 @@ public class Adapter implements CompilerAdapter { </au:expectfailure> <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 unless:set="jdk1.9+"> - <echo>JDK 1.5+</echo> - <testJavac source="1.5" target="1.5"/> - <delete dir="${javac-dir}/classes"/> - <mkdir dir="${javac-dir}/classes"/> - </sequential> - - <sequential if:set="jdk1.6+"> - <echo>JDK 1.6+</echo> - <testJavac source="1.6" target="1.6"/> - <delete dir="${javac-dir}/classes"/> - <mkdir dir="${javac-dir}/classes"/> - </sequential> - - <sequential if:set="jdk1.7+"> - <echo>JDK 1.7+</echo> - <testJavac source="1.7" target="1.7"/> - <delete dir="${javac-dir}/classes"/> - <mkdir dir="${javac-dir}/classes"/> - </sequential> - - <sequential if:set="jdk1.8+"> <echo>JDK 1.8+</echo> <testJavac source="1.8" target="1.8"/> <delete dir="${javac-dir}/classes"/> <mkdir dir="${javac-dir}/classes"/> </sequential> - + <sequential if:set="jdk1.9+"> <echo>JDK 1.9+</echo> <testJavac source="1.9" target="1.9"/> diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml index e6aa794cc..d93b96e49 100644 --- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml +++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml @@ -317,10 +317,7 @@ public class BTest extends TestCase { </target> <target name="testTestMethods"> - <condition property="source" value="6"> - <isset property="jdk1.6+"/> - </condition> - <property name="source" value="5"/> + <property name="source" value="8"/> <echo file="${input}/T1.java">public class T1 extends junit.framework.TestCase { public void testOK() {} diff --git a/src/tests/antunit/taskdefs/secure-input.xml b/src/tests/antunit/taskdefs/secure-input.xml index 8311ce9c3..ae0675ee0 100644 --- a/src/tests/antunit/taskdefs/secure-input.xml +++ b/src/tests/antunit/taskdefs/secure-input.xml @@ -22,7 +22,7 @@ <target name="setUp"> </target> - <target name="test-secure-input" if="jdk1.6+"> + <target name="test-secure-input"> <input message="secure-input:>" addproperty="the.password"> <handler classname="org.apache.tools.ant.input.SecureInputHandler" /> </input> diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml index 58d01f064..72f21ae73 100644 --- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml +++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml @@ -18,9 +18,7 @@ <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" /> <mkdir dir="${tmpdir}" /> @@ -46,14 +44,14 @@ <sleep seconds="1"/> </target> - <target name="testAntlib" depends="setUp" if="jdk1.6+"> + <target name="testAntlib" depends="setUp"> <taskdef classpath="${test.jar}" uri="antlib:org.example" loaderref="loader1"/> <echoooo xmlns="antlib:org.example" message="exemple" /> <au:assertLogContains text="exempleexempleexempleexemple" /> </target> - <target name="testURI" depends="setUp" if="jdk1.6+"> + <target name="testURI" depends="setUp"> <taskdef classpath="${test.jar}" uri="urn:my:exemple" loaderref="loader2" resource="org/example/antlib.xml" /> diff --git a/src/tests/antunit/taskdefs/taskdef-test.xml b/src/tests/antunit/taskdefs/taskdef-test.xml index 95745082a..1da8e9f7c 100644 --- a/src/tests/antunit/taskdefs/taskdef-test.xml +++ b/src/tests/antunit/taskdefs/taskdef-test.xml @@ -41,7 +41,7 @@ <au:assertLogContains text="Hello"/> </target> - <target name="testDirWithPling" depends="setUp" if="jdk1.6+" + <target name="testDirWithPling" depends="setUp" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007"> <property name="dir" location="${tmpdir}/pl!ng"/> <mkdir dir="${dir}"/> diff --git a/src/tests/antunit/taskdefs/xslt-test.xml b/src/tests/antunit/taskdefs/xslt-test.xml index d6f6d6686..b327c7b58 100644 --- a/src/tests/antunit/taskdefs/xslt-test.xml +++ b/src/tests/antunit/taskdefs/xslt-test.xml @@ -187,18 +187,7 @@ undefined='<xsl:value-of select="$undefined"/>' </xslt> </target> - - <target name="testTraceJdk14" unless="jdk1.5+" depends="setUp"> - <xslt in="${legacy.dir}/data.xml" - out="${output}/out.xml" - style="${legacy.dir}/printParams.xsl"> - <param name="set" expression="myvalue"/> - <trace templates="true"/> - </xslt> - <au:assertLogContains text="Failed to enable tracing" level="warning"/> - </target> - - <target name="testTraceJdk15+" if="jdk1.5+" depends="setUp"> + <target name="testTrace" depends="setUp"> <xslt in="${legacy.dir}/data.xml" out="${output}/out.xml" style="${legacy.dir}/printParams.xsl"> |