Fridrich Strba 2023-05-30 16:19:35 +00:00 committed by Git OBS Bridge
parent 68bb2a988c
commit 44d9494098
2 changed files with 2 additions and 41 deletions

View File

@ -163,45 +163,6 @@
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
<!-- Override classes for Java 15+ -->
<mkdir dir="${build.mrOutputDir.15}"/>
<javac destdir="${build.mrOutputDir.15}"
nowarn="true"
debug="true"
optimize="false"
deprecation="true"
source="${compiler.source}"
target="${compiler.target}"
verbose="false"
fork="false">
<src>
<pathelement location="${build.mrSrcDir.15}"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
<!-- Override classes for Java 16+ -->
<mkdir dir="${build.mrOutputDir.16}"/>
<javac destdir="${build.mrOutputDir.16}"
nowarn="true"
debug="true"
optimize="false"
deprecation="true"
source="${compiler.source}"
target="${compiler.target}"
verbose="false"
fork="false">
<src>
<pathelement location="${build.mrSrcDir.16}"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->

View File

@ -29,8 +29,8 @@ Patch0: jsch-junixsocket.patch
Patch1: jsch-log4j.patch
BuildRequires: ant
BuildRequires: fdupes
# We build different multiversion overrides for 9, 10, 11, 15 and 16
BuildRequires: java-devel >= 17
# We build different multiversion overrides for 9, 10, 11
BuildRequires: java-devel >= 11
BuildRequires: bouncycastle
BuildRequires: javapackages-local >= 6
BuildRequires: jna