Accepting request 1199280 from Java:packages

1.85

OBS-URL: https://build.opensuse.org/request/show/1199280
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/beust-jcommander?expand=0&rev=6

0001-ParseValues-NullPointerException-patch.patch

@@ -1,26 +1,26 @@
-From 2b813829d02b89206493520eb86075a43b145db9 Mon Sep 17 00:00:00 2001
+From 4409f9ac0d8d1f64cfd00e91b91cf822d328d526 Mon Sep 17 00:00:00 2001
 From: Roman Vais <rvais@redhat.com>
 Date: Tue, 13 Jun 2017 13:24:24 +0200
 Subject: [PATCH] ParseValues-NullPointerException-patch
 
 ---
- .../java/com/beust/jcommander/Parameterized.java   | 27 ++++++++++++++++++++--
+ .../com/beust/jcommander/Parameterized.java   | 27 +++++++++++++++++--
  1 file changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/com/beust/jcommander/Parameterized.java b/src/main/java/com/beust/jcommander/Parameterized.java
-index 3264008..e937a66 100644
+index ba92301..eb24ce7 100644
 --- a/src/main/java/com/beust/jcommander/Parameterized.java
 +++ b/src/main/java/com/beust/jcommander/Parameterized.java
-@@ -13,6 +13,8 @@ import java.lang.reflect.Type;
- import java.util.Collections;
- import java.util.List;
- import java.util.Set;
+@@ -6,6 +6,8 @@ import com.beust.jcommander.internal.Sets;
+ import java.lang.annotation.Annotation;
+ import java.lang.reflect.*;
+ import java.util.*;
 +import java.util.logging.Level;
 +import java.util.logging.Logger;
+ import java.util.stream.Collectors;
  
  /**
-  * Encapsulate a field or a method annotated with @Parameter or @DynamicParameter
-@@ -180,12 +182,33 @@ public class Parameterized {
+@@ -208,12 +210,33 @@ public class Parameterized {
        String fieldName = Character.toLowerCase(name.charAt(3)) + name.substring(4);
        Object result = null;
        try {
@@ -57,5 +57,5 @@ index 3264008..e937a66 100644
        }
        return result;
 -- 
-2.7.4
+2.46.0
 

_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.85</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,93 @@
+-------------------------------------------------------------------
+Thu Sep  5 17:12:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 1.85
+  * Changes of 1.84
+    + Changed the method processing to only ignore bridge and 
+      synthetic methods which are not duplicate of other normal 
+      methods.
+    + Renamed BuilderExample to BridgeMethodsExample.
+    + Exclude methods which are bridge or synthetic when parsing
+    + Added public IMainParameter interface to fix 
+      cbeust/jcommander#559
+    + Fixed: A default fulfils requirement, but does not count as 
+      assignment.
+    + Expand dynamic arg expands non dynamic args
+    + Order parameters with the same order by name in usage()
+    + Asserting that double quotes are not removed.
+    + Replace arrayOf with array literals in Kotlin sample
+    + Keep original exception thrown by the parameter setter method
+    + Fixes #557: Now validates BEFORE conversion
+    + Fixed: Broken link to TestNG example
+    + Allow acceptUnknownOption with variableArity
+    + Fixed: Default value of primitive type must not satisfy 
+      required = true
+    + Simplified code: No need for public class
+    + No ParameterException if a default value assigned for 
+      required params
+    + Fixed documentation: Contributor fixed inidex.html instead of 
+      index.adoc
+    + Example for @Parameter on setter method
+    + Fixed docs formatting
+    + Mentioning Charset converter in docs
+    + Improved ByteOrderConverterTest: Removing unused Exception
+    + Adds a CharsetConverter.
+    + Mentioning ByteOrder converter in docs
+    + Improved ByteOrderConverterTest: Proofs that parameter may be 
+      in mixed case
+    + Adds a ByteOrderConverter.
+    + Improved VariableArityTest: Proofs that unknown options are 
+      safely passed through
+    + Test for dontShowNullForMissingCommandDescription
+    + Fix usage() for missing description on commands
+    + Moved description of defaultValueDescription to usage chapter
+    + Fixed backwards compatiblity fail: 
+      ParameterDescription.getDefault() must not produce different 
+      result as existing code relies on current behavior
+    + Fixed test fail: NullPointerException in ParameterDescription
+    + Fixed #471 @Param(default = )
+    + Clarification: List and Set can be comma-separated
+    + Modify convertValue() to fix issue 509 and add a test
+    + Performance: String.isEmpty() is faster than .equals()
+    + Return an empty list when parsing an empty string
+    + Using secret GPG_PASSPHRASE for improved security
+    + Fixed: Deprecation Warning about new Integer(int)
+    + Ignore default value for required parameter
+  * Changes of 1.85
+    + Fixed: Compilation fails due to Java 11 API used on Java 8 
+      target
+    + Cleanup configFile after enabledAtSignExpansionTest
+    + Simplified AtSignExpansion code
+    + Improved testing of AtSignExpansion
+    + Fix: enable parameter values to start with @
+    + Simplified Strings::startsWith
+    + Simplified Strings::join(String, List<Object>)
+    + Simplified Strings::join(String, List<String>)
+- Modified patch:
+  * 0001-ParseValues-NullPointerException-patch.patch
+    + rebase
+
+-------------------------------------------------------------------
+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.85
 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