diff --git a/0001-ParseValues-NullPointerException-patch.patch b/0001-ParseValues-NullPointerException-patch.patch index 312ff62..8496759 100644 --- a/0001-ParseValues-NullPointerException-patch.patch +++ b/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 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 diff --git a/_service b/_service index 86131f6..96419b7 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/cbeust/jcommander.git - 1.83 + 1.85 @PARENT_TAG@ **.jar **.class diff --git a/beust-jcommander.changes b/beust-jcommander.changes index 9cc93f0..6fd78f5 100644 --- a/beust-jcommander.changes +++ b/beust-jcommander.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Thu Sep 5 17:12:06 UTC 2024 - Fridrich Strba + +- 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) + + Simplified Strings::join(String, List) +- Modified patch: + * 0001-ParseValues-NullPointerException-patch.patch + + rebase + ------------------------------------------------------------------- Mon May 20 16:56:11 UTC 2024 - Fridrich Strba diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 47ff216..5fe7346 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -19,7 +19,7 @@ %define __requires_exclude java-headless %global short_name jcommander Name: beust-%{short_name} -Version: 1.83 +Version: 1.85 Release: 0 Summary: Java framework for parsing command line parameters License: Apache-2.0 diff --git a/jcommander-1.83.tar.xz b/jcommander-1.83.tar.xz deleted file mode 100644 index db76282..0000000 --- a/jcommander-1.83.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:124cc4dcf342042f82bd4732ff575ebc3e5e26ad6e288713f0a56c87931562b0 -size 89548 diff --git a/jcommander-1.85.tar.xz b/jcommander-1.85.tar.xz new file mode 100644 index 0000000..473d354 --- /dev/null +++ b/jcommander-1.85.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:217b845c53531f23497851c22a89354e1ad9c0e7049975cb0555d81350e1650c +size 370532