rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=98

Browse Source
This commit is contained in:
Fridrich Strba
2017-09-29 15:58:04 +00:00
committed by Git OBS Bridge
parent 7202db1600
commit dfb5a6548f
1 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
apache-ant-1.9.9-detect_gij_as_java6.patch
View File

@@ -1,3 +1,47 @@
--- 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 @@
@@ -9,3 +53,14 @@
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"/>