diff --git a/_service b/_service
index 269f593..259ba70 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
git
https://github.com/remkop/picocli.git
- 2716d09
+ v4.7.5
v*
@PARENT_TAG@
v(.*)
diff --git a/picocli-4.7.4.tar.xz b/picocli-4.7.4.tar.xz
deleted file mode 100644
index b92551e..0000000
--- a/picocli-4.7.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7a504c724b1cbfc769455476cf61f541cc6aebcb9b51c1e806553d52e89beb3
-size 902960
diff --git a/picocli-4.7.4.pom b/picocli-4.7.5.pom
similarity index 95%
rename from picocli-4.7.4.pom
rename to picocli-4.7.5.pom
index ffacd70..1e521e6 100644
--- a/picocli-4.7.4.pom
+++ b/picocli-4.7.5.pom
@@ -4,7 +4,7 @@
4.0.0info.picoclipicocli
- 4.7.4
+ 4.7.5picocliJava 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
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-codegen-4.7.4.pom b/picocli-codegen-4.7.5.pom
similarity index 93%
rename from picocli-codegen-4.7.4.pom
rename to picocli-codegen-4.7.5.pom
index c2cdc83..7fba4f1 100644
--- a/picocli-codegen-4.7.4.pom
+++ b/picocli-codegen-4.7.5.pom
@@ -4,7 +4,7 @@
4.0.0info.picoclipicocli-codegen
- 4.7.4
+ 4.7.5picocli-codegenPicocli Code Generation - Tools to generate documentation, configuration, source code and other files from a picocli model.https://picocli.info
@@ -32,7 +32,7 @@
info.picoclipicocli
- 4.7.4
+ 4.7.5compile
diff --git a/picocli-shell-jline2-4.7.4.pom b/picocli-shell-jline2-4.7.5.pom
similarity index 93%
rename from picocli-shell-jline2-4.7.4.pom
rename to picocli-shell-jline2-4.7.5.pom
index eea85f9..8c7a799 100644
--- a/picocli-shell-jline2-4.7.4.pom
+++ b/picocli-shell-jline2-4.7.5.pom
@@ -4,7 +4,7 @@
4.0.0info.picoclipicocli-shell-jline2
- 4.7.4
+ 4.7.5picocli-shell-jline2Picocli Shell JLine2 - easily build interactive shell applications with JLine 2 and picocli.https://picocli.info
@@ -32,7 +32,7 @@
info.picoclipicocli
- 4.7.4
+ 4.7.5compile
diff --git a/picocli.changes b/picocli.changes
index 91eae02..ef606bb 100644
--- a/picocli.changes
+++ b/picocli.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+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.
+
-------------------------------------------------------------------
Sat Aug 26 05:11:45 UTC 2023 - Fridrich Strba
diff --git a/picocli.spec b/picocli.spec
index 4515ec8..8c5ebfc 100644
--- a/picocli.spec
+++ b/picocli.spec
@@ -17,7 +17,7 @@
Name: picocli
-Version: 4.7.4
+Version: 4.7.5
Release: 0
Summary: Tiny Command Line Interface
License: Apache-2.0
@@ -28,7 +28,6 @@ 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
-Patch0: revert-version.patch
BuildRequires: ant
BuildRequires: aqute-bnd
BuildRequires: fdupes
diff --git a/revert-version.patch b/revert-version.patch
deleted file mode 100644
index 74220aa..0000000
--- a/revert-version.patch
+++ /dev/null
@@ -1,233 +0,0 @@
---- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/DynamicProxyConfigGenerator.java
-+++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/DynamicProxyConfigGenerator.java
-@@ -58,7 +58,7 @@ public class DynamicProxyConfigGenerator {
- },
- footerHeading = "%nExample%n",
- footer = {
-- " java -cp \"myapp.jar;picocli-4.7.5-SNAPSHOT.jar;picocli-codegen-4.7.5-SNAPSHOT.jar\" " +
-+ " java -cp \"myapp.jar;picocli-4.7.4.jar;picocli-codegen-4.7.4.jar\" " +
- "picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator my.pkg.MyClass"
- },
- mixinStandardHelpOptions = true, version = "picocli-codegen gen-proxy-config " + CommandLine.VERSION)
---- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/JniConfigGenerator.java
-+++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/JniConfigGenerator.java
-@@ -31,7 +31,7 @@ public class JniConfigGenerator {
- },
- footerHeading = "%nExample%n",
- footer = {
-- " java -cp \"myapp.jar;picocli-4.7.5-SNAPSHOT.jar;picocli-codegen-4.7.5-SNAPSHOT.jar\" " +
-+ " java -cp \"myapp.jar;picocli-4.7.4.jar;picocli-codegen-4.7.4.jar\" " +
- "picocli.codegen.aot.graalvm.JniConfigGenerator my.pkg.MyClass"
- },
- mixinStandardHelpOptions = true, sortOptions = false,
---- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java
-+++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java
-@@ -95,7 +95,7 @@ public class ReflectionConfigGenerator {
- },
- footerHeading = "%nExample%n",
- footer = {
-- " java -cp \"myapp.jar;picocli-4.7.5-SNAPSHOT.jar;picocli-codegen-4.7.5-SNAPSHOT.jar\" " +
-+ " java -cp \"myapp.jar;picocli-4.7.4.jar;picocli-codegen-4.7.4.jar\" " +
- "picocli.codegen.aot.graalvm.ReflectionConfigGenerator my.pkg.MyClass"
- },
- mixinStandardHelpOptions = true, sortOptions = false,
---- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ResourceConfigGenerator.java
-+++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ResourceConfigGenerator.java
-@@ -54,7 +54,7 @@ public class ResourceConfigGenerator {
- },
- footerHeading = "%nExample%n",
- footer = {
-- " java -cp \"myapp.jar;picocli-4.7.5-SNAPSHOT.jar;picocli-codegen-4.7.5-SNAPSHOT.jar\" " +
-+ " java -cp \"myapp.jar;picocli-4.7.4.jar;picocli-codegen-4.7.4.jar\" " +
- "picocli.codegen.aot.graalvm.ResourceConfigGenerator my.pkg.MyClass"
- },
- mixinStandardHelpOptions = true, version = "picocli-codegen gen-resource-config " + CommandLine.VERSION)
---- a/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java
-+++ b/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java
-@@ -190,7 +190,7 @@ public class ManPageGenerator implements Callable {
- "",
- "Example",
- "-------",
-- " java -Duser.language=de -cp \"myapp.jar;picocli-4.7.5-SNAPSHOT.jar;picocli-codegen-4.7.5-SNAPSHOT.jar\" " +
-+ " java -Duser.language=de -cp \"myapp.jar;picocli-4.7.4.jar;picocli-codegen-4.7.4.jar\" " +
- "picocli.codegen.docgen.manpage.ManPageGenerator my.pkg.MyClass"
- }
- )
---- a/src/main/java/picocli/AutoComplete.java
-+++ b/src/main/java/picocli/AutoComplete.java
-@@ -116,7 +116,7 @@ public class AutoComplete {
- "",
- "Example",
- "-------",
-- " java -cp \"myapp.jar;picocli-4.7.5-SNAPSHOT.jar\" \\",
-+ " java -cp \"myapp.jar;picocli-4.7.4.jar\" \\",
- " picocli.AutoComplete my.pkg.MyClass"
- },
- exitCodeListHeading = "%nExit Codes:%n",
---- a/src/main/java/picocli/CommandLine.java
-+++ b/src/main/java/picocli/CommandLine.java
-@@ -148,7 +148,7 @@ import static picocli.CommandLine.Help.Column.Overflow.WRAP;
- public class CommandLine {
-
- /** This is picocli version {@value}. */
-- public static final String VERSION = "4.7.5-SNAPSHOT";
-+ public static final String VERSION = "4.7.4";
- private static final Tracer TRACER = new Tracer();
-
- private CommandSpec commandSpec;
-@@ -979,7 +979,7 @@ public class CommandLine {
- * or whether such values should be rejected with a missing parameter exception.
- * The default is {@code false}, so by default input like {@code -x=subcommand} is rejected if {@code -x} is an option that takes a String parameter, and {@code subcommand} is a subcommand of this command.
- * @return {@code true} when options can have parameter values that match subcommand names or aliases, {@code false} when such values should be rejected with a missing parameter exception
-- * @since 4.7.5-SNAPSHOT
-+ * @since 4.7.4
- * @see ParserSpec#allowSubcommandsAsOptionParameters()
- */
- public boolean isAllowSubcommandsAsOptionParameters() {
-@@ -994,7 +994,7 @@ public class CommandLine {
- * subcommands, call the setter last, after adding subcommands.
- * @param newValue the new setting. When {@code true}, options can have parameter values that match subcommand names or aliases, when {@code false}, such values are rejected with a missing parameter exception
- * @return this {@code CommandLine} object, to allow method chaining
-- * @since 4.7.5-SNAPSHOT
-+ * @since 4.7.4
- * @see ParserSpec#allowSubcommandsAsOptionParameters(boolean)
- */
- public CommandLine setAllowSubcommandsAsOptionParameters(boolean newValue) {
-@@ -1009,7 +1009,7 @@ public class CommandLine {
- * The default is {@code false}, so by default input like {@code -x=--some-option} is rejected if {@code -x} is an option that takes a String parameter, and {@code --some-option} is an option of this command.
- *
This method only considers actual options of this command, as opposed to {@link #isUnmatchedOptionsAllowedAsOptionParameters()}, which considers values that resemble options.
- * @return {@code true} when options can have parameter values that match the name of an option in this command, {@code false} when such values should be rejected with a missing parameter exception
-- * @since 4.7.5-SNAPSHOT
-+ * @since 4.7.4
- * @see #isUnmatchedOptionsAllowedAsOptionParameters()
- * @see ParserSpec#allowOptionsAsOptionParameters()
- */
-@@ -1029,7 +1029,7 @@ public class CommandLine {
- * subcommands, call the setter last, after adding subcommands.
- * @param newValue the new setting. When {@code true}, options can have parameter values that match the name of an option in this command, when {@code false}, such values are rejected with a missing parameter exception
- * @return this {@code CommandLine} object, to allow method chaining
-- * @since 4.7.5-SNAPSHOT
-+ * @since 4.7.4
- * @see #setUnmatchedOptionsAllowedAsOptionParameters(boolean)
- * @see ParserSpec#allowOptionsAsOptionParameters(boolean)
- */
-@@ -4737,7 +4737,7 @@ public class CommandLine {
- * Note that picocli cannot reliably detect declaration order in commands that have both {@code @Option}-annotated methods and {@code @Option}-annotated fields.
- * The default ({@code true}) is to sort alphabetically.
- * @return whether options in the synopsis should be shown in alphabetic order.
-- * @since 4.7.5-SNAPSHOT */
-+ * @since 4.7.4 */
- boolean sortSynopsis() default true;
-
- /** Prefix required options with this character in the options list. The default is no marker: the synopsis
-@@ -5033,7 +5033,7 @@ public class CommandLine {
- *
- *
- * The {@link #convert(String)} method of this class always throws an UnsupportedOperationException.
-- * @since 4.7.5-SNAPSHOT
-+ * @since 4.7.4
- */
- public static final class UseDefaultConverter implements ITypeConverter