67 lines
3.5 KiB
Diff
67 lines
3.5 KiB
Diff
--- apache-ant-1.9.9/build.xml 2017-02-02 18:55:08.000000000 +0100
|
|
+++ apache-ant-1.9.9/build.xml 2017-09-29 17:56:30.407106336 +0200
|
|
@@ -375,7 +375,7 @@
|
|
</not>
|
|
</condition>
|
|
<property name="ignoresystemclasses" value="false"/>
|
|
- <available property="jdk1.6+" classname="java.net.CookieStore"/>
|
|
+ <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
|
|
<available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
|
|
<available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
|
|
<available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>
|
|
--- apache-ant-1.9.9/src/etc/testcases/core/antclassloader.xml 2017-02-02 18:55:08.000000000 +0100
|
|
+++ apache-ant-1.9.9/src/etc/testcases/core/antclassloader.xml 2017-09-29 17:56:07.367106249 +0200
|
|
@@ -56,7 +56,7 @@
|
|
package org.example;
|
|
public class Foo {}
|
|
]]></echo>
|
|
- <available property="jdk1.6+" classname="java.net.CookieStore"/>
|
|
+ <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
|
|
<condition property="source" value="6">
|
|
<isset property="jdk1.6+"/>
|
|
</condition>
|
|
--- apache-ant-1.9.9/src/etc/testcases/taskdefs/optional/junit.xml 2017-02-02 18:55:08.000000000 +0100
|
|
+++ apache-ant-1.9.9/src/etc/testcases/taskdefs/optional/junit.xml 2017-09-29 17:56:13.107106270 +0200
|
|
@@ -339,7 +339,7 @@
|
|
public void bad() {
|
|
throw new RuntimeException("failed");}
|
|
}</echo>
|
|
- <available property="jdk1.6+" classname="java.net.CookieStore"/>
|
|
+ <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
|
|
<condition property="source" value="6">
|
|
<isset property="jdk1.6+"/>
|
|
</condition>
|
|
--- apache-ant-1.9.9/src/etc/testcases/types/assertions.xml 2017-02-02 18:55:08.000000000 +0100
|
|
+++ apache-ant-1.9.9/src/etc/testcases/types/assertions.xml 2017-09-29 17:55:23.495106083 +0200
|
|
@@ -21,7 +21,7 @@
|
|
<import file="../buildfiletest-base.xml"/>
|
|
|
|
<target name="setUp">
|
|
- <available property="jdk1.6+" classname="java.net.CookieStore"/>
|
|
+ <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
|
|
<condition property="source" value="6">
|
|
<isset property="jdk1.6+"/>
|
|
</condition>
|
|
--- apache-ant-1.9.9/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2017-02-02 18:55:08.000000000 +0100
|
|
+++ apache-ant-1.9.9/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2017-09-29 17:32:14.444688494 +0200
|
|
@@ -169,7 +169,7 @@
|
|
Class.forName("java.net.Proxy");
|
|
javaVersion = JAVA_1_5;
|
|
javaVersionNumber++;
|
|
- Class.forName("java.net.CookieStore");
|
|
+ Class.forName("java.util.ServiceLoader");
|
|
javaVersion = JAVA_1_6;
|
|
javaVersionNumber++;
|
|
Class.forName("java.nio.file.FileSystem");
|
|
--- apache-ant-1.9.9/src/tests/antunit/antunit-base.xml 2017-02-02 18:55:08.000000000 +0100
|
|
+++ apache-ant-1.9.9/src/tests/antunit/antunit-base.xml 2017-09-29 17:56:24.567106313 +0200
|
|
@@ -30,7 +30,7 @@
|
|
<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"/>
|
|
+ <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
|
|
<available property="jdk1.5+" classname="java.net.Proxy"/>
|
|
<condition property="build.sysclasspath.only">
|
|
<equals arg1="${build.sysclasspath}" arg2="only"/>
|