pool/ws-jaxme
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 962937 from Java:packages

Browse Source 
Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/962937
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ws-jaxme?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:59:09 +00:00 committed by Git OBS Bridge
commit dc4af08f0c
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ws-jaxme-sourcetarget.patch
View File

@ -5,7 +5,7 @@
<javac classpathref="jaxme.class.path" debug="${debug}" <javac classpathref="jaxme.class.path" debug="${debug}"
optimize="${optimize}" destdir="${build.jm.classes}" optimize="${optimize}" destdir="${build.jm.classes}"
- source="1.3" target="1.3" - source="1.3" target="1.3"
+ source="1.6" target="1.6" + source="1.8" target="1.8"
failonerror="true"> failonerror="true">
<src> <src>
<pathelement location="${src.jm}"/> <pathelement location="${src.jm}"/>
@ -14,7 +14,7 @@
<javac debug="${debug}" <javac debug="${debug}"
optimize="${optimize}" destdir="${build.jm.classes}" optimize="${optimize}" destdir="${build.jm.classes}"
- source="1.3" target="1.3" - source="1.3" target="1.3"
+ source="1.6" target="1.6" + source="1.8" target="1.8"
failonerror="true"> failonerror="true">
<src> <src>
<pathelement location="${src.jm}"/> <pathelement location="${src.jm}"/>
@ -25,7 +25,7 @@
<target name="JS.compile" depends="JS.antlr,init"> <target name="JS.compile" depends="JS.antlr,init">
<javac destdir="${build.js.classes}" debug="${debug}" <javac destdir="${build.js.classes}" debug="${debug}"
- source="1.3" target="1.3" - source="1.3" target="1.3"
+ source="1.6" target="1.6" + source="1.8" target="1.8"
optimize="${optimize}" classpathref="js.class.path"> optimize="${optimize}" classpathref="js.class.path">
<src> <src>
<pathelement location="${src.js}"/> <pathelement location="${src.js}"/>
@ -34,7 +34,7 @@
debug="${debug}" optimize="${optimize}" debug="${debug}" optimize="${optimize}"
includes="org/apache/ws/jaxme/js/junit/**/*" includes="org/apache/ws/jaxme/js/junit/**/*"
- source="1.3" target="1.3" - source="1.3" target="1.3"
+ source="1.6" target="1.6" + source="1.8" target="1.8"
classpathref="js.test.path"> classpathref="js.test.path">
<src path="${src.js}"/> <src path="${src.js}"/>
<src path="${build.js.src}"/> <src path="${build.js.src}"/>
@ -45,7 +45,7 @@
<javac destdir="@{destdir}" srcdir="@{srcdir}" debug="${debug}" <javac destdir="@{destdir}" srcdir="@{srcdir}" debug="${debug}"
optimize="${optimize}" classpathref="@{classpathref}" optimize="${optimize}" classpathref="@{classpathref}"
- excludes="@{excludes}" source="1.3" target="1.3"> - excludes="@{excludes}" source="1.3" target="1.3">
+ excludes="@{excludes}" source="1.6" target="1.6"> + excludes="@{excludes}" source="1.8" target="1.8">
<exclude name="@{java14classes}" unless="have14"/> <exclude name="@{java14classes}" unless="have14"/>
</javac> </javac>
</sequential> </sequential>
@ -57,7 +57,7 @@ diff -up ws-jaxme-0.5.2/ant/pm.xml ws-jaxme-0.5.2/ant/pm.xml
<javac classpathref="pm.class.path" debug="${debug}" <javac classpathref="pm.class.path" debug="${debug}"
optimize="${optimize}" destdir="${build.pm.classes}" optimize="${optimize}" destdir="${build.pm.classes}"
- source="1.3" target="1.3" - source="1.3" target="1.3"
+ source="1.6" target="1.6" + source="1.8" target="1.8"
srcdir="${src.pm}"> srcdir="${src.pm}">
<exclude name="org/apache/ws/jaxme/pm/junit/**/*"/> <exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
<exclude name="org/apache/ws/jaxme/**/api4j/*" unless="have.inoapi4j"/> <exclude name="org/apache/ws/jaxme/**/api4j/*" unless="have.inoapi4j"/>
@ -66,7 +66,7 @@ diff -up ws-jaxme-0.5.2/ant/pm.xml ws-jaxme-0.5.2/ant/pm.xml
<target name="PM.generate.compile" depends="PM.generate"> <target name="PM.generate.compile" depends="PM.generate">
<javac debug="${debug}" <javac debug="${debug}"
- source="1.3" target="1.3" - source="1.3" target="1.3"
+ source="1.6" target="1.6" + source="1.8" target="1.8"
optimize="${optimize}" destdir="${build.pm.test.classes}"> optimize="${optimize}" destdir="${build.pm.test.classes}">
<classpath> <classpath>
<path refid="pm.class.path"/> <path refid="pm.class.path"/>

12
ws-jaxme.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Mar 18 19:17:27 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* ws-jaxme-sourcetarget.patch
+ Build with source/target levels 8
-------------------------------------------------------------------
Thu Mar 17 09:49:40 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- On relevant distributions, build against the standalone jaxb-api
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 22 18:56:20 UTC 2022 - Fridrich Strba <fstrba@suse.com> Tue Feb 22 18:56:20 UTC 2022 - Fridrich Strba <fstrba@suse.com>

12
ws-jaxme.spec
View File

@ -37,7 +37,7 @@ BuildRequires: antlr
BuildRequires: apache-commons-codec BuildRequires: apache-commons-codec
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: hsqldb BuildRequires: hsqldb
BuildRequires: java-devel >= 1.6 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: jaxp_transform_impl BuildRequires: jaxp_transform_impl
BuildRequires: junit >= 3.8.1 BuildRequires: junit >= 3.8.1
@ -48,6 +48,9 @@ BuildRequires: xml-commons-apis
BuildRequires: xml-commons-resolver BuildRequires: xml-commons-resolver
BuildRequires: xmldb-api BuildRequires: xmldb-api
BuildArch: noarch BuildArch: noarch
%if 0%{?suse_version} > 1500
BuildRequires: glassfish-jaxb-api
%endif
%description %description
A Java/XML binding compiler takes as input a schema description (in A Java/XML binding compiler takes as input a schema description (in
@ -112,6 +115,9 @@ find . -name "*.jar" | xargs rm
%build %build
export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver" export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver"
export CLASSPATH=$(build-classpath \ export CLASSPATH=$(build-classpath \
%if 0%{?suse_version} > 1500
glassfish-jaxb-api \
%endif
antlr \ antlr \
apache-commons-codec \ apache-commons-codec \
hsqldb \ hsqldb \
@ -124,7 +130,7 @@ export CLASSPATH=$(build-classpath \
xml-commons-resolver \ xml-commons-resolver \
junit) junit)
ant Docs.all \ ant Docs.all \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
-Dbuild.sysclasspath=first \ -Dbuild.sysclasspath=first \
-Ddocbook.home=%{_datadir}/xml/docbook \ -Ddocbook.home=%{_datadir}/xml/docbook \
-Ddocbookxsl.home=%{_datadir}/xml/docbook/stylesheet/nwalsh/current -Ddocbookxsl.home=%{_datadir}/xml/docbook/stylesheet/nwalsh/current
@ -147,7 +153,7 @@ install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version}
cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name}-%{version} cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name}-%{version}
%files %files
%doc LICENSE %license LICENSE
%{_javadir}/%{base_name} %{_javadir}/%{base_name}
%files javadoc %files javadoc