Accepting request 1112748 from Java:packages
fix build with java >= 20 OBS-URL: https://build.opensuse.org/request/show/1112748 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hsqldb?expand=0&rev=33
This commit is contained in:
commit
76c3d3e608
@ -6,8 +6,8 @@ Index: hsqldb/build/build.xml
|
||||
|
||||
<target name="mdesc-hsqldbmin" depends="sw-hsqldbmin" if="ant.java.iscjava11" >
|
||||
<javac srcdir="${swsrcmin}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
sourcepath=""
|
||||
includeantruntime="false"
|
||||
@ -15,8 +15,8 @@ Index: hsqldb/build/build.xml
|
||||
<fail unless='_servlet_available'
|
||||
message="Place Jar file for Servlet API at '${servletapi.lib}', or set property 'servletapi.lib'"/>
|
||||
<javac srcdir="${swsrc}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
sourcepath=""
|
||||
includeantruntime="false"
|
||||
@ -24,8 +24,8 @@ Index: hsqldb/build/build.xml
|
||||
<target name="classes" depends="sw-hsqldb,-javajsse"
|
||||
description="compiles JVM-independent non-lib/util/cmdline/servlet classes">
|
||||
<javac srcdir="${swsrc}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
includeantruntime="false"
|
||||
encoding="${javac.encoding}"
|
||||
@ -33,8 +33,8 @@ Index: hsqldb/build/build.xml
|
||||
<target name="-util" depends="-prepare, sw-hsqldb"
|
||||
description="compiles the util folder">
|
||||
<javac srcdir="${swsrc}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
includeantruntime="false"
|
||||
encoding="${javac.encoding}"
|
||||
@ -42,8 +42,8 @@ Index: hsqldb/build/build.xml
|
||||
<!-- This javac is no longer dependent upon default attr. includeAntRuntime=true -->
|
||||
<!-- Ant resolver and preprocessor moved to trunk/integration/ant/prepocessor/src -->
|
||||
<javac srcdir="src"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
encoding="${javac.encoding}"
|
||||
destdir="classes"
|
||||
@ -51,8 +51,8 @@ Index: hsqldb/build/build.xml
|
||||
-conditionalize-sqlfile-scanner, -sqlfile-scanner">
|
||||
|
||||
<javac srcdir="${swsrctool}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
includeantruntime="false"
|
||||
encoding="${javac.encoding}"
|
||||
@ -60,8 +60,8 @@ Index: hsqldb/build/build.xml
|
||||
<target name="-swing" depends="sw-hsqldb"
|
||||
description="compiles the swing based classes in the util folder">
|
||||
<javac srcdir="${swsrc}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
includeantruntime="false"
|
||||
encoding="${javac.encoding}"
|
||||
@ -69,8 +69,8 @@ Index: hsqldb/build/build.xml
|
||||
<target name="scanner-driver" depends="-cmdline"
|
||||
description="Build Scanner Driver. For SqlTool scanner developers.">
|
||||
<javac srcdir="${swsrc}"
|
||||
+ source="7"
|
||||
+ target="7"
|
||||
+ source="8"
|
||||
+ target="8"
|
||||
bootclasspath="${javac.bootcp.override}"
|
||||
includeantruntime="false"
|
||||
encoding="${javac.encoding}"
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 21 05:45:42 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Modified patch:
|
||||
* hsqldb-mdescriptor.patch
|
||||
+ Build with java source/target levels 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 20 14:27:13 UTC 2023 - David Anes <david.anes@suse.com>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user