rpm/ws-jaxme
SHA256
1
0
Fork 0
forked from pool/ws-jaxme
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-18 19:18:03 +00:00 committed by Git OBS Bridge
parent 6e1bfb9478
commit c7a2ca854f
3 changed files with 16 additions and 9 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}"
optimize="${optimize}" destdir="${build.jm.classes}"
- source="1.3" target="1.3"
+ source="1.6" target="1.6"
+ source="1.8" target="1.8"
failonerror="true">
<src>
<pathelement location="${src.jm}"/>
@ -14,7 +14,7 @@
<javac debug="${debug}"
optimize="${optimize}" destdir="${build.jm.classes}"
- source="1.3" target="1.3"
+ source="1.6" target="1.6"
+ source="1.8" target="1.8"
failonerror="true">
<src>
<pathelement location="${src.jm}"/>
@ -25,7 +25,7 @@
<target name="JS.compile" depends="JS.antlr,init">
<javac destdir="${build.js.classes}" debug="${debug}"
- source="1.3" target="1.3"
+ source="1.6" target="1.6"
+ source="1.8" target="1.8"
optimize="${optimize}" classpathref="js.class.path">
<src>
<pathelement location="${src.js}"/>
@ -34,7 +34,7 @@
debug="${debug}" optimize="${optimize}"
includes="org/apache/ws/jaxme/js/junit/**/*"
- source="1.3" target="1.3"
+ source="1.6" target="1.6"
+ source="1.8" target="1.8"
classpathref="js.test.path">
<src path="${src.js}"/>
<src path="${build.js.src}"/>
@ -45,7 +45,7 @@
<javac destdir="@{destdir}" srcdir="@{srcdir}" debug="${debug}"
optimize="${optimize}" classpathref="@{classpathref}"
- 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"/>
</javac>
</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}"
optimize="${optimize}" destdir="${build.pm.classes}"
- source="1.3" target="1.3"
+ source="1.6" target="1.6"
+ source="1.8" target="1.8"
srcdir="${src.pm}">
<exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
<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">
<javac debug="${debug}"
- 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}">
<classpath>
<path refid="pm.class.path"/>

7
ws-jaxme.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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>

4
ws-jaxme.spec
View File

@ -37,7 +37,7 @@ BuildRequires: antlr
BuildRequires: apache-commons-codec
BuildRequires: docbook-xsl-stylesheets
BuildRequires: hsqldb
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
BuildRequires: jaxp_transform_impl
BuildRequires: junit >= 3.8.1
@ -130,7 +130,7 @@ export CLASSPATH=$(build-classpath \
xml-commons-resolver \
junit)
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 \
-Ddocbook.home=%{_datadir}/xml/docbook \
-Ddocbookxsl.home=%{_datadir}/xml/docbook/stylesheet/nwalsh/current