Fridrich Strba 2018-05-15 17:35:43 +00:00 committed by Git OBS Bridge
parent 8ec03b4c27
commit 2d9ed38184
3 changed files with 14 additions and 6 deletions

View File

@ -5,7 +5,7 @@
<!--unjar src="${jar_api}" dest="${class_dir}"/--> <!--unjar src="${jar_api}" dest="${class_dir}"/-->
<javac srcdir="${src_api}" <javac srcdir="${src_api}"
- source="1.2" target="1.2" - source="1.2" target="1.2"
+ source="1.6" target="1.6" + source="8" target="8"
includes="${api_dirs}" includes="${api_dirs}"
destdir="${class_dir}" destdir="${class_dir}"
debug="true"> debug="true">
@ -14,7 +14,7 @@
<!--javac srcdir="${src}:${api_src_dir}"--> <!--javac srcdir="${src}:${api_src_dir}"-->
<javac srcdir="${src}" <javac srcdir="${src}"
- source="1.2" target="1.2" - source="1.2" target="1.2"
+ source="1.6" target="1.6" + source="8" target="8"
includes="${topdirs}" includes="${topdirs}"
destdir="${class_dir}" destdir="${class_dir}"
+ encoding="ISO-8859-1" + encoding="ISO-8859-1"
@ -26,7 +26,7 @@
<target name="test_compile" depends="api, test_init"> <target name="test_compile" depends="api, test_init">
<javac srcdir="${src}" includes="org/codehaus/stax/test/**/*.java" <javac srcdir="${src}" includes="org/codehaus/stax/test/**/*.java"
- source="1.2" target="1.2" - source="1.2" target="1.2"
+ source="1.6" target="1.6" + source="8" target="8"
destdir="${test_class_dir}" destdir="${test_class_dir}"
debug="true"> debug="true">
<classpath> <classpath>

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 15 17:34:21 UTC 2018 - fstrba@suse.com
- Modified patch:
* bea-stax-target16.patch -> bea-stax-target8.patch
+ Build with source and target 8 to prepare for a possible
removal of 1.6 compatibility in OpenJDK 11
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 16:17:04 UTC 2017 - fstrba@suse.com Thu Sep 14 16:17:04 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package bea-stax # spec file for package bea-stax
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,10 +25,10 @@ License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://dev2dev.bea.com/technologies/stax/index.jsp Url: http://dev2dev.bea.com/technologies/stax/index.jsp
Source0: stax-src-1.2.0_rc1-dev.zip Source0: stax-src-1.2.0_rc1-dev.zip
Patch0: bea-stax-target16.patch Patch0: bea-stax-target8.patch
Patch2: bea-stax-gcj-build.patch Patch2: bea-stax-gcj-build.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 1.6 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: unzip BuildRequires: unzip
#!BuildIgnore: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap