From 926ca538f65b337f95273f54d3b9fbf85c74a4028978c6bb908ae84f1967756d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 19:20:22 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main picocli revision a0268764040d41f59b8d9b914056db2a --- .gitattributes | 23 ++++ _service | 20 +++ picocli-4.7.5.pom | 31 +++++ picocli-4.7.5.tar.xz | 3 + picocli-build.xml | 220 +++++++++++++++++++++++++++++++++ picocli-codegen-4.7.5.pom | 39 ++++++ picocli-shell-jline2-4.7.5.pom | 45 +++++++ picocli.changes | 97 +++++++++++++++ picocli.spec | 132 ++++++++++++++++++++ 9 files changed, 610 insertions(+) create mode 100644 .gitattributes create mode 100644 _service create mode 100644 picocli-4.7.5.pom create mode 100644 picocli-4.7.5.tar.xz create mode 100644 picocli-build.xml create mode 100644 picocli-codegen-4.7.5.pom create mode 100644 picocli-shell-jline2-4.7.5.pom create mode 100644 picocli.changes create mode 100644 picocli.spec 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/_service b/_service new file mode 100644 index 0000000..259ba70 --- /dev/null +++ b/_service @@ -0,0 +1,20 @@ + + + git + https://github.com/remkop/picocli.git + v4.7.5 + v* + @PARENT_TAG@ + v(.*) + **/*.jar + **/*.zip + **/*.pom + **/*gradle* + docs + + + *.tar + xz + + + diff --git a/picocli-4.7.5.pom b/picocli-4.7.5.pom new file mode 100644 index 0000000..1e521e6 --- /dev/null +++ b/picocli-4.7.5.pom @@ -0,0 +1,31 @@ + + + 4.0.0 + info.picocli + picocli + 4.7.5 + picocli + Java command line parser with both an annotations API and a programmatic API. Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. Easily included as source to avoid adding a dependency. + https://picocli.info + 2018 + + + The Apache Software License, version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rpopma + Remko Popma + rpopma@apache.org + + + + scm:git:https://github.com/remkop/picocli.git + scm:git:ssh://github.com:remkop/picocli.git + https://github.com/remkop/picocli/tree/master + + diff --git a/picocli-4.7.5.tar.xz b/picocli-4.7.5.tar.xz new file mode 100644 index 0000000..b23577b --- /dev/null +++ b/picocli-4.7.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ddfd46881a03e7a9c4381faf598e60e1f4a6025cb75b1d7f1ea3b65d9ab14b1 +size 903540 diff --git a/picocli-build.xml b/picocli-build.xml new file mode 100644 index 0000000..e664d3c --- /dev/null +++ b/picocli-build.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/picocli-codegen-4.7.5.pom b/picocli-codegen-4.7.5.pom new file mode 100644 index 0000000..7fba4f1 --- /dev/null +++ b/picocli-codegen-4.7.5.pom @@ -0,0 +1,39 @@ + + + 4.0.0 + info.picocli + picocli-codegen + 4.7.5 + picocli-codegen + Picocli Code Generation - Tools to generate documentation, configuration, source code and other files from a picocli model. + https://picocli.info + 2018 + + + The Apache Software License, version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rpopma + Remko Popma + rpopma@apache.org + + + + scm:git:https://github.com/remkop/picocli.git + scm:git:ssh://github.com:remkop/picocli.git + https://github.com/remkop/picocli/tree/master + + + + info.picocli + picocli + 4.7.5 + compile + + + diff --git a/picocli-shell-jline2-4.7.5.pom b/picocli-shell-jline2-4.7.5.pom new file mode 100644 index 0000000..8c7a799 --- /dev/null +++ b/picocli-shell-jline2-4.7.5.pom @@ -0,0 +1,45 @@ + + + 4.0.0 + info.picocli + picocli-shell-jline2 + 4.7.5 + picocli-shell-jline2 + Picocli Shell JLine2 - easily build interactive shell applications with JLine 2 and picocli. + https://picocli.info + 2018 + + + The Apache Software License, version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rpopma + Remko Popma + rpopma@apache.org + + + + scm:git:https://github.com/remkop/picocli.git + scm:git:ssh://github.com:remkop/picocli.git + https://github.com/remkop/picocli/tree/master + + + + info.picocli + picocli + 4.7.5 + compile + + + jline + jline + 2.14.6 + compile + + + diff --git a/picocli.changes b/picocli.changes new file mode 100644 index 0000000..0130e90 --- /dev/null +++ b/picocli.changes @@ -0,0 +1,97 @@ +------------------------------------------------------------------- +Sun Sep 10 10:27:31 UTC 2023 - Fridrich Strba + +- Reproducible builds: Do not create timestamps with bnd wrap + +------------------------------------------------------------------- +Sun Aug 27 06:46:38 UTC 2023 - Fridrich Strba + +- Update to version 4.7.5 + * Enhancements: + + Java 22 update: improve logic for detecting if the output + stream is connected to a terminal. + + Mask parameters in trace log when echo=false for interactive + options and positional parameters. + * Bugfixes: + + Fix positional parameters bug with late-resolved arity + variable. + + Don't generate auto-complete for hidden attributes in + picocli.shell.jline3.PicoCommand. + + ArgGroup with exclusive=false and multiplicity=1 should + require at least one option; fix regression and refine + solution introduced in [#1848][#2030]. + * DOC fixes: + + Improve GraalVM documentation: add + graalvm-native-image-plugin. + + Commit html files with LF line-endings. +- Removed patch: + * revert-version.patch + + not needed any more + +------------------------------------------------------------------- +Sat Aug 26 05:11:45 UTC 2023 - Fridrich Strba + +- Fetch sources from upstream repository, since our pull request + https://github.com/remkop/picocli/pull/2045 has been integrated + +------------------------------------------------------------------- +Tue Jun 13 12:49:00 UTC 2023 - Fridrich Strba + +- Update to version 4.7.4 + * Fixes: + + API: Add setter for name in + picocli.shell.jline3.PicocliCommands. + + Enhancement: Improved feedback on mistyped subcommands + + Enhancement: prevent + java.nio.charset.UnsupportedCharsetException: cp0 on windows, + and fall back to the default charset if the charset provided + by System property sun.stdout.encoding is invalid + + Bugfix: Option "mapFallbackValue" ignored when inherited to + subcommand + + Bugfix: fix issue with required options in ArgGroup becoming + optional when combined with DefaultValueProvider +- Fetch sources using source service: this allows filter out + binaries with spurious legal status and which we don't use for + build +- Due to a bug in the upstream github repository, fetch sources from + our private fork until https://github.com/remkop/picocli/pull/2045 + gets integrated upstream +- Added patch: + * revert-version.patch + + revert a version change between our fixed code and the + upstream tag + +------------------------------------------------------------------- +Mon Jun 5 17:59:16 UTC 2023 - Fridrich Strba + +- Require java 9 for build so that we can build the module-info.java + always +- Build all classes with source/target 8 and the module-info.java + with release 9, which makes the jars usable with java 8 and higher + +------------------------------------------------------------------- +Thu Jun 1 11:46:11 UTC 2023 - Anton Shvetz + +- Upgrade to version 4.7.3 + * full changes from previous versions are in + https://github.com/remkop/picocli/blob/v4.7.3/RELEASE-NOTES.md +- Package artifacts: picocli-{codegen,shell-jline2} +- JPMS: package module discriptors when building with java >= 9 +- Take POMs from Maven Central + +------------------------------------------------------------------- +Fri Jun 24 09:48:56 UTC 2022 - Fridrich Strba + +- Build picocli using ant to avoid cycles + +------------------------------------------------------------------- +Tue Jan 18 08:15:11 UTC 2022 - Fridrich Strba + +- Upgrade to version 4.6.2 + * full changes from previous versions are in + https://github.com/remkop/picocli/blob/v4.6.2/RELEASE-NOTES.md + +------------------------------------------------------------------- +Fri Nov 8 09:48:24 UTC 2019 - Fridrich Strba + +- Initial packaging of picocli 4.0.4 diff --git a/picocli.spec b/picocli.spec new file mode 100644 index 0000000..6d4051a --- /dev/null +++ b/picocli.spec @@ -0,0 +1,132 @@ +# +# spec file for package picocli +# +# 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/ +# + + +Name: picocli +Version: 4.7.5 +Release: 0 +Summary: Tiny Command Line Interface +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://picocli.info/ +Source0: %{name}-%{version}.tar.xz +Source1: %{name}-build.xml +Source2: https://repo1.maven.org/maven2/info/%{name}/%{name}/%{version}/%{name}-%{version}.pom +Source3: https://repo1.maven.org/maven2/info/%{name}/%{name}-codegen/%{version}/%{name}-codegen-%{version}.pom +Source4: https://repo1.maven.org/maven2/info/%{name}/%{name}-shell-jline2/%{version}/%{name}-shell-jline2-%{version}.pom +BuildRequires: ant +BuildRequires: aqute-bnd +BuildRequires: fdupes +BuildRequires: java-devel >= 9 +BuildRequires: javapackages-local +BuildRequires: jline >= 2 +BuildArch: noarch + +%description +Java command line parser with both an annotations API and a programmatic API. +Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. +Easily included as source to avoid adding a dependency. + +%package codegen +Summary: Picocli Code Generation +Group: Development/Libraries/Java + +%description codegen +Java command line parser with both an annotations API and a programmatic API. +Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. +Easily included as source to avoid adding a dependency. + +Tools to generate documentation, configuration, source code and other files +from a picocli model. + +%package shell-jline2 +Summary: Picocli Shell JLine2 +Group: Development/Libraries/Java + +%description shell-jline2 +Java command line parser with both an annotations API and a programmatic API. +Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. +Easily included as source to avoid adding a dependency. + +Library to build interactive shell applications with JLine 2 and picocli. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q +cp %{SOURCE1} build.xml + +%build +%{ant} \ + -Dproject.version=%{version} \ + -Djline2.jar=$(find-jar jline/jline) \ + jar javadoc + +echo "-reproducible: true" >> bnd.bnd +echo "-noextraheaders: true" >> bnd.bnd +echo "-snapshot: SNAPSHOT" >> bnd.bnd + +# Convert to OSGi bundle +bnd wrap \ + --force \ + --bsn %{name} \ + --version %{version} \ + --output target/%{name}-%{version}.bar \ + --properties bnd.bnd \ + target/%{name}-%{version}.jar +mv target/%{name}-%{version}.bar target/%{name}-%{version}.jar + +%install +#jar +install -dm0755 %{buildroot}%{_javadir}/%{name} +install -pm0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +install -pm0644 target/%{name}-codegen-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-codegen.jar +install -pm0644 target/%{name}-shell-jline2-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-shell-jline2.jar + +#pom +install -dm0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +install -pm0644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-codegen.pom +install -pm0644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/%{name}/%{name}-shell-jline2.pom + +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +%add_maven_depmap %{name}/%{name}-codegen.pom %{name}/%{name}-codegen.jar -f codegen +%add_maven_depmap %{name}/%{name}-shell-jline2.pom %{name}/%{name}-shell-jline2.jar -f shell-jline2 + +#javadoc +install -dm0755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE +%doc README.md + +%files codegen -f .mfiles-codegen + +%files shell-jline2 -f .mfiles-shell-jline2 + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE + +%changelog