From 83e522924c101c34ad3ab79adb0e0e45ba60e73dea1ce00cd9b49390821461e2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 30 Oct 2024 22:47:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/picocli?expand=0&rev=33 --- _multibuild | 4 + picocli-extras-build.xml | 138 +++++++++++++++++++++++++++++++++ picocli-extras.change | 107 +++++++++++++++++++++++++ picocli-extras.changes | 113 +++++++++++++++++++++++++++ picocli-extras.spec | 99 +++++++++++++++++++++++ picocli-shell-jline3-4.7.5.pom | 45 +++++++++++ picocli.changes | 6 ++ pre_checkin.sh | 4 + 8 files changed, 516 insertions(+) create mode 100644 _multibuild create mode 100644 picocli-extras-build.xml create mode 100644 picocli-extras.change create mode 100644 picocli-extras.changes create mode 100644 picocli-extras.spec create mode 100644 picocli-shell-jline3-4.7.5.pom create mode 100644 pre_checkin.sh diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..ce000d9 --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + picocli-extras + + diff --git a/picocli-extras-build.xml b/picocli-extras-build.xml new file mode 100644 index 0000000..64e20bd --- /dev/null +++ b/picocli-extras-build.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/picocli-extras.change b/picocli-extras.change new file mode 100644 index 0000000..53cdcf6 --- /dev/null +++ b/picocli-extras.change @@ -0,0 +1,107 @@ +------------------------------------------------------------------- +Wed Oct 2 15:59:18 UTC 2024 - Fridrich Strba + +- Spec file cleanup + +------------------------------------------------------------------- +Mon Apr 29 11:53:54 UTC 2024 - Fridrich Strba + +- The binaries are compatible with java 1.8 + +------------------------------------------------------------------- +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-extras.changes b/picocli-extras.changes new file mode 100644 index 0000000..2f960b2 --- /dev/null +++ b/picocli-extras.changes @@ -0,0 +1,113 @@ +------------------------------------------------------------------- +Wed Oct 30 22:45:12 UTC 2024 - Fridrich Strba + +- Create a second spec file picocli-extras to be able to build + the picocli-shell-jline3 artifact without build cycles + +------------------------------------------------------------------- +Wed Oct 2 15:59:18 UTC 2024 - Fridrich Strba + +- Spec file cleanup + +------------------------------------------------------------------- +Mon Apr 29 11:53:54 UTC 2024 - Fridrich Strba + +- The binaries are compatible with java 1.8 + +------------------------------------------------------------------- +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-extras.spec b/picocli-extras.spec new file mode 100644 index 0000000..b1c12c3 --- /dev/null +++ b/picocli-extras.spec @@ -0,0 +1,99 @@ +# +# spec file for package picocli-extras +# +# 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 +# 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/ +# + + +# The automatic requires would be java-headless >= 9, but the +# binaries are java 8 compatible +%define __requires_exclude java-headless +%global base_name picocli +Name: %{base_name}-extras +Version: 4.7.5 +Release: 0 +Summary: Tiny Command Line Interface +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://picocli.info/ +Source0: %{base_name}-%{version}.tar.xz +Source1: %{name}-build.xml +Source2: https://repo1.maven.org/maven2/info/%{base_name}/%{base_name}-shell-jline3/%{version}/%{base_name}-shell-jline3-%{version}.pom +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel >= 9 +BuildRequires: javapackages-local >= 6 +BuildRequires: jline3 +BuildRequires: picocli +Requires: java-headless >= 1.8 +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 -n %{base_name}-shell-jline3 +Summary: Picocli Shell JLine3 +Group: Development/Libraries/Java +Requires: java-headless >= 1.8 + +%description -n %{base_name}-shell-jline3 +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 3 and picocli. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n %{base_name}-%{version} +cp %{SOURCE1} build.xml + +%build +%{ant} \ + -Dproject.version=%{version} \ + -Djline3.jar=$(find-jar jline3/jline) \ + -D%{base_name}.jar=$(find-jar %{base_name}/%{base_name}) \ + jar javadoc + +%install +#jar +install -dm0755 %{buildroot}%{_javadir}/%{base_name} +install -pm0644 target/%{base_name}-shell-jline3-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/%{base_name}-shell-jline3.jar + +#pom +install -dm0755 %{buildroot}%{_mavenpomdir}/%{base_name} +%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{base_name}/%{base_name}-shell-jline3.pom + +%add_maven_depmap %{base_name}/%{base_name}-shell-jline3.pom %{base_name}/%{base_name}-shell-jline3.jar -f shell-jline3 + +#javadoc +install -dm0755 %{buildroot}%{_javadocdir}/%{name} +cp -r target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -n %{base_name}-shell-jline3 -f .mfiles-shell-jline3 + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE + +%changelog diff --git a/picocli-shell-jline3-4.7.5.pom b/picocli-shell-jline3-4.7.5.pom new file mode 100644 index 0000000..f11d2e1 --- /dev/null +++ b/picocli-shell-jline3-4.7.5.pom @@ -0,0 +1,45 @@ + + + 4.0.0 + info.picocli + picocli-shell-jline3 + 4.7.5 + picocli-shell-jline3 + Picocli Shell JLine3 - easily build interactive shell applications with JLine 3 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 + + + org.jline + jline + 3.23.0 + compile + + + diff --git a/picocli.changes b/picocli.changes index 53cdcf6..2f960b2 100644 --- a/picocli.changes +++ b/picocli.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 30 22:45:12 UTC 2024 - Fridrich Strba + +- Create a second spec file picocli-extras to be able to build + the picocli-shell-jline3 artifact without build cycles + ------------------------------------------------------------------- Wed Oct 2 15:59:18 UTC 2024 - Fridrich Strba diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..a7e71a9 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,4 @@ +#!/bin/sh +cp picocli.changes picocli-extras.changes +osc service runall format_spec_file +