From 37b01ad04285d861db3aeff1075c15b8455e4f3fc6736d412a020bfb0cca2ee8 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 29 Apr 2024 11:54:36 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/picocli?expand=0&rev=25

---
 picocli-build.xml | 14 +++++++++-----
 picocli.changes   |  5 +++++
 picocli.spec      |  6 +++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/picocli-build.xml b/picocli-build.xml
index e664d3c..c84b35a 100644
--- a/picocli-build.xml
+++ b/picocli-build.xml
@@ -11,7 +11,8 @@
   <property name="project.artifactId" value="picocli"/>
   <property name="project.version" value="[UNKNOWN]"/>
 
-  <property name="compiler.source" value="8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.dir" value="target"/>
@@ -43,6 +44,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -75,6 +77,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -114,6 +117,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -154,8 +158,7 @@
   <!-- ====================================================================== -->
 
   <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc
-             packagenames="*"
+    <javadoc packagenames="*"
              destdir="${reporting.outputDirectory}/apidocs"
              access="protected"
              verbose="false"
@@ -174,14 +177,15 @@
              charset="UTF-8"
              linksource="false"
              breakiterator="false"
-             source="${compiler.source}"
-             >
+             source="${compiler.source}">
       <sourcepath>
         <pathelement location="${build.srcDir}"/>
         <pathelement location="picocli-codegen/${build.srcDir}"/>
+        <pathelement location="picocli-shell-jline2/${build.srcDir}"/>
       </sourcepath>
       <classpath>
         <pathelement location="${build.outputDir}"/>
+        <pathelement location="${jline2.jar}"/>
       </classpath>
     </javadoc>
   </target>
diff --git a/picocli.changes b/picocli.changes
index 0130e90..4a139d5 100644
--- a/picocli.changes
+++ b/picocli.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 29 11:53:54 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- The binaries are compatible with java 1.8
+
 -------------------------------------------------------------------
 Sun Sep 10 10:27:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/picocli.spec b/picocli.spec
index 6d4051a..075bb4e 100644
--- a/picocli.spec
+++ b/picocli.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package picocli
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,10 @@ BuildRequires:  fdupes
 BuildRequires:  java-devel >= 9
 BuildRequires:  javapackages-local
 BuildRequires:  jline >= 2
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
+Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description

From dc1255874f7d1e982a9667f5d2c0925c0f6d019ed0be79e3d712606c6cceeb53 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 29 Apr 2024 12:26:13 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/picocli?expand=0&rev=26

---
 picocli.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/picocli.spec b/picocli.spec
index 075bb4e..01e1bbc 100644
--- a/picocli.spec
+++ b/picocli.spec
@@ -16,6 +16,9 @@
 #
 
 
+# The automatic requires would be java-headless >= 9, but the
+# binaries are java 8 compatible
+%define __requires_exclude java-headless
 Name:           picocli
 Version:        4.7.5
 Release:        0
@@ -34,9 +37,6 @@ BuildRequires:  fdupes
 BuildRequires:  java-devel >= 9
 BuildRequires:  javapackages-local
 BuildRequires:  jline >= 2
-# The automatic requires would be java-headless >= 9, but the
-# binaries are java 8 compatible
-%define __requires_exclude java-headless
 Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
@@ -48,6 +48,7 @@ Easily included as source to avoid adding a dependency.
 %package codegen
 Summary:        Picocli Code Generation
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description codegen
 Java command line parser with both an annotations API and a programmatic API.
@@ -60,6 +61,7 @@ from a picocli model.
 %package shell-jline2
 Summary:        Picocli Shell JLine2
 Group:          Development/Libraries/Java
+Requires:       java-headless >= 1.8
 
 %description shell-jline2
 Java command line parser with both an annotations API and a programmatic API.