pool/ant
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2017-09-29 16:14:40 +00:00 committed by Git OBS Bridge
parent eccdf62186
commit 140b3ab567
7 changed files with 0 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ant-antlr.changes
View File

@ -1,13 +1,3 @@
-------------------------------------------------------------------
Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
- Added patch:
* apache-ant-1.9.9-detect_gij_as_java6.patch
+ Detect our java-1_5_0-gcj_compat as java 6 to allow building
with source and target level 1.6
Code that needs classes from java 6 that are not part of the
gij/gcj will need just to require java-devel >= 1.6
-------------------------------------------------------------------
Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com

2
ant-antlr.spec
View File

@ -45,7 +45,6 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
Patch6: apache-ant-1.9.9-detect_gij_as_java6.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -356,7 +355,6 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm

10
ant-junit.changes
View File

@ -1,13 +1,3 @@
-------------------------------------------------------------------
Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
- Added patch:
* apache-ant-1.9.9-detect_gij_as_java6.patch
+ Detect our java-1_5_0-gcj_compat as java 6 to allow building
with source and target level 1.6
Code that needs classes from java 6 that are not part of the
gij/gcj will need just to require java-devel >= 1.6
-------------------------------------------------------------------
Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com

2
ant-junit.spec
View File

@ -45,7 +45,6 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
Patch6: apache-ant-1.9.9-detect_gij_as_java6.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -356,7 +355,6 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm

10
ant.changes
View File

@ -1,13 +1,3 @@
-------------------------------------------------------------------
Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
- Added patch:
* apache-ant-1.9.9-detect_gij_as_java6.patch
+ Detect our java-1_5_0-gcj_compat as java 6 to allow building
with source and target level 1.6
Code that needs classes from java 6 that are not part of the
gij/gcj will need just to require java-devel >= 1.6
-------------------------------------------------------------------
Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com

2
ant.spec
View File

@ -44,7 +44,6 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
Patch6: apache-ant-1.9.9-detect_gij_as_java6.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -355,7 +354,6 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm

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

@ -1,66 +0,0 @@
--- 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"/>