From 38b47c5a6aa069fcdefabce332eb3d07a263da1073a78b7a8f716a7ef1425be6 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 2 Jun 2023 21:21:43 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=44

---
 jsch-build.xml | 110 ++++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 57 deletions(-)

diff --git a/jsch-build.xml b/jsch-build.xml
index 59870ba..772f09a 100644
--- a/jsch-build.xml
+++ b/jsch-build.xml
@@ -57,14 +57,61 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
+  <!-- Compilation targets                                                    -->
   <!-- ====================================================================== -->
 
   <condition property="build9">
     <javaversion atleast="9"/>
   </condition>
   
-  <target name="compile9" description="Compiler the overrides for Java 9+" if="build9">
+  <condition property="build10">
+    <javaversion atleast="10"/>
+  </condition>
+  
+  <condition property="build11">
+    <javaversion atleast="11"/>
+  </condition>
+  
+  <condition property="build15">
+    <javaversion atleast="15"/>
+  </condition>
+  
+  <condition property="build16">
+    <javaversion atleast="16"/>
+  </condition>
+  
+  <target name="compile" description="Compile the code">
+    <echo>Java/JVM version: ${ant.java.version}</echo> 
+    <mkdir dir="${build.genSrcDir}"/>
+    <copy todir="${build.genSrcDir}">
+      <fileset dir="${build.templateDir}"/>
+      <filterchain>
+        <expandproperties>
+          <propertyset>
+            <propertyref name="versionWithoutMinus"/>
+          </propertyset>
+        </expandproperties>
+      </filterchain>
+    </copy>
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}"
+           nowarn="true"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           release="${compiler.release}"
+           verbose="false"
+           fork="false">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+        <pathelement location="${build.genSrcDir}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <mkdir dir="${build.mrOutputDir}"/>
+  </target>
+
+  <target name="compile9" description="Compile the overrides for Java 9+" if="build9">
     <!-- Override classes for Java 9+ -->
     <mkdir dir="${build.mrOutputDir.9}"/>
     <javac destdir="${build.mrOutputDir.9}"
@@ -105,11 +152,7 @@
     </javac>
   </target>
 
-  <condition property="build10">
-    <javaversion atleast="10"/>
-  </condition>
-  
-  <target name="compile10" description="Compiler the overrides for Java 10+" if="build10">
+  <target name="compile10" description="Compile the overrides for Java 10+" if="build10">
     <!-- Override classes for Java 10+ -->
     <mkdir dir="${build.mrOutputDir.10}"/>
     <javac destdir="${build.mrOutputDir.10}"
@@ -131,11 +174,7 @@
     </javac>
   </target>
 
-  <condition property="build11">
-    <javaversion atleast="11"/>
-  </condition>
-  
-  <target name="compile11" description="Compiler the overrides for Java 11+" if="build11">
+  <target name="compile11" description="Compile the overrides for Java 11+" if="build11">
     <!-- Override classes for Java 11+ -->
     <mkdir dir="${build.mrOutputDir.11}"/>
     <javac destdir="${build.mrOutputDir.11}"
@@ -157,11 +196,7 @@
     </javac>
   </target>
 
-  <condition property="build15">
-    <javaversion atleast="15"/>
-  </condition>
-  
-  <target name="compile15" description="Compiler the overrides for Java 15+" if="build15">
+  <target name="compile15" description="Compile the overrides for Java 15+" if="build15">
     <!-- Override classes for Java 15+ -->
     <mkdir dir="${build.mrOutputDir.15}"/>
     <javac destdir="${build.mrOutputDir.15}"
@@ -183,15 +218,7 @@
     </javac>
   </target>
 
-  <condition property="build16">
-    <javaversion atleast="16"/>
-  </condition>
-  
-  <condition property="build16">
-    <available classname="java.net.UnixDomainSocketAddress"/>
-  </condition>
-  
-  <target name="compile16" description="Compiler the overrides for Java 16+" if="build16">
+  <target name="compile16" description="Compile the overrides for Java 16+" if="build16">
     <!-- Override classes for Java 16+ -->
     <mkdir dir="${build.mrOutputDir.16}"/>
     <javac destdir="${build.mrOutputDir.16}"
@@ -213,37 +240,6 @@
     </javac>
   </target>
 
-  <target name="compile" description="Compile the code">
-    <echo>Java/JVM version: ${ant.java.version}</echo> 
-    <mkdir dir="${build.genSrcDir}"/>
-    <copy todir="${build.genSrcDir}">
-      <fileset dir="${build.templateDir}"/>
-      <filterchain>
-        <expandproperties>
-          <propertyset>
-            <propertyref name="versionWithoutMinus"/>
-          </propertyset>
-        </expandproperties>
-      </filterchain>
-    </copy>
-    <mkdir dir="${build.outputDir}"/>
-    <javac destdir="${build.outputDir}"
-           nowarn="true"
-           debug="true"
-           optimize="false"
-           deprecation="true"
-           release="${compiler.release}"
-           verbose="false"
-           fork="false">
-      <src>
-        <pathelement location="${build.srcDir}"/>
-        <pathelement location="${build.genSrcDir}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <mkdir dir="${build.mrOutputDir}"/>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Javadoc target                                                         -->
   <!-- ====================================================================== -->