From de282ebe184ab06a2c3ee4c01939e612c9614ad8cbfc13aef8e37dc318481272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 11:18:15 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main beust-jcommander revision 7e7a56317e01c32faef84c37331ee589 --- .gitattributes | 23 ++ ...rseValues-NullPointerException-patch.patch | 61 ++++ _service | 19 ++ beust-jcommander-build.xml | 119 ++++++++ beust-jcommander.changes | 88 ++++++ beust-jcommander.pom | 277 ++++++++++++++++++ beust-jcommander.spec | 89 ++++++ jcommander-1.82.tar.xz | 3 + 8 files changed, 679 insertions(+) create mode 100644 .gitattributes create mode 100644 0001-ParseValues-NullPointerException-patch.patch create mode 100644 _service create mode 100644 beust-jcommander-build.xml create mode 100644 beust-jcommander.changes create mode 100644 beust-jcommander.pom create mode 100644 beust-jcommander.spec create mode 100644 jcommander-1.82.tar.xz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/0001-ParseValues-NullPointerException-patch.patch b/0001-ParseValues-NullPointerException-patch.patch new file mode 100644 index 0000000..312ff62 --- /dev/null +++ b/0001-ParseValues-NullPointerException-patch.patch @@ -0,0 +1,61 @@ +From 2b813829d02b89206493520eb86075a43b145db9 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 ++++++++++++++++++++-- + 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 +--- 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; ++import java.util.logging.Level; ++import java.util.logging.Logger; + + /** + * Encapsulate a field or a method annotated with @Parameter or @DynamicParameter +@@ -180,12 +182,33 @@ public class Parameterized { + String fieldName = Character.toLowerCase(name.charAt(3)) + name.substring(4); + Object result = null; + try { +- Field field = method.getDeclaringClass().getDeclaredField(fieldName); ++ Field field = object.getClass().getDeclaredField(fieldName); + if (field != null) { + setFieldAccessible(field); + result = field.get(object); + } +- } catch(NoSuchFieldException | IllegalAccessException ex) { ++ } catch(NoSuchFieldException ex) { ++ Class clazz = object.getClass(); ++ Field found = null; ++ while (clazz != null && method.getDeclaringClass().isAssignableFrom(clazz)) { ++ try { ++ found = clazz.getDeclaredField(fieldName); ++ } catch (NoSuchFieldException nfex) { ++ // ignore ++ } ++ if (found != null) break; ++ clazz = clazz.getSuperclass(); ++ } ++ if (found != null) { ++ setFieldAccessible(found); ++ try { ++ result = found.get(object); ++ } catch (IllegalAccessException iex) { ++ // ignore ++ } ++ } ++ ++ } catch(IllegalAccessException ex) { + // ignore + } + return result; +-- +2.7.4 + diff --git a/_service b/_service new file mode 100644 index 0000000..6b852bd --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + git + https://github.com/cbeust/jcommander.git + 1.82 + @PARENT_TAG@ + **.jar + **.class + gradle* + cobalt* + lib + .git + + + *.tar + xz + + + diff --git a/beust-jcommander-build.xml b/beust-jcommander-build.xml new file mode 100644 index 0000000..e9429f5 --- /dev/null +++ b/beust-jcommander-build.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/beust-jcommander.changes b/beust-jcommander.changes new file mode 100644 index 0000000..7c37af8 --- /dev/null +++ b/beust-jcommander.changes @@ -0,0 +1,88 @@ +------------------------------------------------------------------- +Wed May 3 09:07:55 UTC 2023 - Fridrich Strba + +- Update to version 1.82 + * Fixes: + + #392: fixed bug when parsing arguments is ignoring case + sensitivity option + + Add a test for Parameter order usage + + add a test for Path converter + + Add automatic module name to manifest + + Add check if Boolean parameter is default null, then do not + flip value + + Added testing modules + + Add format tests for DefaultUsageFormatter, + UnixStyleUsageFormatter + + add Path converter change #414 to changelog + + Add test case for issue 367 + + Add testing for UnixStyleUsageFormatter + + Add unix-style formatter, allow DefaultUsageFormatter to be + extended easier + + Allow generics of type and in + parameters + + Allow main parameters to be a single field. + + allow System.out to be replaced by something else (f.e. + System.err) + + Allow UsageFormatter to be set in JCommander Builder + + Change UsageFormatter into an interface + + Clean up DefaultUsageFormatter + + Create MyDelegate.java + + Create UsageFormatter (preliminary) + + Enable usage() ordering for DynamicParameter + + Encapsulate MainParameter. + + encode user input to massage error message + + Expose more of the UsageFormatter implementations + + Fields annotated with @ParametersDelegate are now allowed to + be final. + + FIX #380 Main parameter doesn't support Converter + + Fix error message when failing to convert a Path + + Fixing: squid:ModifiersOrderCheck and squid:S2444 + + Fix locale-related issues in usage formatter tests + + Get boolean/Boolean getter with "is" prefix + + GH-477 Environment Variable Default Provider + + make console configurable by JCommander.Builder + + Make UsageFormatter abstract, Create DefaultUsageFormatter + + Only one DefaultConverterFactory + + Remove String.join usage - resolves #381 + + Remove the generic in IStringConverterFactory + + Restrict access to JCommander.Options again + + Support arity for main parameters. + + Update DefaultParameterizedParser.java + + Update IParameterizedParser.java + + Update JCommander.java + + usage() hides 'Comments:' header when only hidden commands + exist + + Use Builder API as constructor is deprecated + + Use get default getter approach if is + method is not found + * Upgrade needed by new code in xmvn 4.2.0 +- Fetch sources using source service and clean the tarball of + unnecessary binary files + +------------------------------------------------------------------- +Mon Apr 8 18:11:28 UTC 2019 - Fridrich Strba + +- Remove reference to pom parent from pom.xml file, since we are + not building with maven. + +------------------------------------------------------------------- +Thu Feb 7 16:28:14 UTC 2019 - Jan Engelhardt + +- Avoid double shipping of documentation. +- Ensure neutrality of descriptions. + +------------------------------------------------------------------- +Thu Dec 6 12:25:36 UTC 2018 - Fridrich Strba + +- Fix javadoc build with older JDK versions + +------------------------------------------------------------------- +Thu Oct 25 20:55:17 UTC 2018 - Fridrich Strba + +- Build with java source/target levels 8 since the code uses + String.join() which does not exist before java 8 + +------------------------------------------------------------------- +Wed Oct 24 06:47:17 UTC 2018 - Fridrich Strba + +- Initial packaging built without maven, adapted from Fedora rpm diff --git a/beust-jcommander.pom b/beust-jcommander.pom new file mode 100644 index 0000000..70f5b62 --- /dev/null +++ b/beust-jcommander.pom @@ -0,0 +1,277 @@ + + + + 4.0.0 + com.beust + jcommander + jar + JCommander + @VERSION@ + A Java framework to parse command line options with annotations. + http://beust.com/jcommander + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:git:git@github.com:cbeust/jcommander.git + scm:git:git@github.com:cbeust/jcommander.git + git@github.com:cbeust/jcommander.git + + + + + jcenter + bintray + http://jcenter.bintray.com + + + + + + + sonatype-nexus-staging + Nexus Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + Cedric Beust + + + + + org.sonatype.oss + oss-parent + 3 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.1 + + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.1 + + UTF-8 + + + + + + org.apache.felix + maven-bundle-plugin + 2.1.0 + + + bundle-manifest + process-classes + + manifest + + + + <_versionpolicy>$(@) + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.10 + + false + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + *.internal + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.felix + + maven-bundle-plugin + + + [2.1.0,) + + + manifest + + + + + + + + + + + + + + + + + org.testng + testng + 6.8.21 + jar + test + + + jcommander + com.beust + + + + + + + + + + license + + + + com.mycila.maven-license-plugin + maven-license-plugin + 1.7.0 + + false +
src/main/license/license-header.txt
+ + src/** + pom.xml + + + **/.git/** + + **/target/** + + false + + + + + check + + + + + + + + + + + sign + + + + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + + + + + + + + diff --git a/beust-jcommander.spec b/beust-jcommander.spec new file mode 100644 index 0000000..f738efe --- /dev/null +++ b/beust-jcommander.spec @@ -0,0 +1,89 @@ +# +# spec file +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global short_name jcommander +Name: beust-%{short_name} +Version: 1.82 +Release: 0 +Summary: Java framework for parsing command line parameters +License: Apache-2.0 +Group: Development/Libraries/Java +URL: http://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 +Source2: %{name}-build.xml +Patch0: 0001-ParseValues-NullPointerException-patch.patch +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local +Requires: java >= 1.8 +Obsoletes: %{short_name} < %{version}-%{release} +Provides: %{short_name} = %{version}-%{release} +BuildArch: noarch + +%description +JCommander is a Java framework that allows parsing command line +parameters (with annotations). + +%package javadoc +Summary: API documentation for %{name} +Group: Development/Libraries/Java + +%description javadoc +This package contains the %{summary}. + +%prep +%setup -q -n %{short_name}-%{version} +%patch0 -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 + +%install +# jars +install -d -m 0755 %{buildroot}%{_javadir} +install -m 644 target/%{short_name}-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar + +# javadoc +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir}/%{name}/ + +%files -f .mfiles +%license license.txt +%doc notice.md README.markdown + +%files javadoc +%{_javadocdir}/%{name} + +%changelog diff --git a/jcommander-1.82.tar.xz b/jcommander-1.82.tar.xz new file mode 100644 index 0000000..29cf825 --- /dev/null +++ b/jcommander-1.82.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c7491f478fec8edbac88ca2e87b1d3d3f4a37c42338a0b328ad92b35269923a +size 88472