Sync from SUSE:SLFO:Main beust-jcommander revision 59b9d52894681917163ab0599ffe2318

_service

@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/cbeust/jcommander.git</param>
-		<param name="revision">1.82</param>
+		<param name="revision">1.83</param>
 		<param name="versionformat">@PARENT_TAG@</param>
         <param name="exclude">**.jar</param>
         <param name="exclude">**.class</param>

beust-jcommander-build.xml

@@ -23,7 +23,8 @@
   <property name="build.srcDir" value="src/main/java"/>
   <property name="build.resourceDir" value="src/main/resources"/>
   
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
   
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
@@ -48,14 +49,30 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           target="${compiler.target}" 
+           release="${compiler.release}" 
            verbose="false" 
-           fork="false" 
-           source="${compiler.source}">
+           fork="false">
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
     </javac>
+    <javac destdir="${build.outputDir}" 
+           encoding="${project.build.sourceEncoding}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           release="9" 
+           verbose="false" 
+           fork="false">
+      <modulepath>
+        <pathelement location="${build.outputDir}"/>
+      </modulepath>
+      <src>
+        <pathelement location="."/>
+      </src>
+	  <include name="**/module-info.java"/>
+    </javac>
   </target>
 
   <!-- ====================================================================== -->

beust-jcommander.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon May 20 16:56:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 1.83
+  * Fixes:
+    + Fixed Docs Timestamp
+    + Fixed: #563 - JCommander does not recognize command by alias.
+    + fixed: missing null check
+    + renamed IRule to IParametersValidator
+    + `@Parameters(rules = <? extends IRule>)`
+    + Unit Test for #532
+    + Fixed #532: @-syntax not working with command objects
+    + enable testng tests
+    + Fix regression with removed usage methods
+    + Add OSGi entries in MANIFEST.MF during jar creation
+
+-------------------------------------------------------------------
+Wed Feb 21 08:20:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Wed May  3 09:07:55 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

beust-jcommander.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package beust-jcommander
 #
-# 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
@@ -16,14 +16,15 @@
 #
 
 
+%define __requires_exclude java-headless
 %global short_name jcommander
 Name:           beust-%{short_name}
-Version:        1.82
+Version:        1.83
 Release:        0
 Summary:        Java framework for parsing command line parameters
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://jcommander.org/
+URL:            https://jcommander.org/
 Source0:        %{short_name}-%{version}.tar.xz
 # Adapted from earlier version that still shipped poms. It uses kobalt for building now
 Source1:        %{name}.pom
@@ -31,8 +32,8 @@ Source2:        %{name}-build.xml
 Patch0:         0001-ParseValues-NullPointerException-patch.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  java-devel >= 9
+BuildRequires:  javapackages-local >= 6
 Requires:       java >= 1.8
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       %{short_name} = %{version}-%{release}
@@ -51,15 +52,13 @@ This package contains the %{summary}.
 
 %prep
 %setup -q -n %{short_name}-%{version}
-%patch0 -p1
+%patch -P 0 -p1
 
 chmod -x license.txt
 cp -p %{SOURCE1} pom.xml
 cp -p %{SOURCE2} build.xml
 sed -i 's/@VERSION@/%{version}/g' pom.xml build.xml
 
-%pom_remove_parent .
-
 %build
 %{ant} jar javadoc
 
@@ -71,7 +70,7 @@ install -m 644 target/%{short_name}-%{version}.jar \
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc