Apache Commons CLI Release Notes

- CLI uses the + CLI uses the Options class, as a container for - + Option instances. There are two ways to create Options in CLI. One of them is via the constructors, the other way is via the factory methods defined in @@ -86,11 +86,11 @@

Parsing the CLI

The parse method defined on - + CommandLineParser takes an Options instance and a String[] of arguments and returns a - + CommandLine.

Using a boolean option

Defining Java Property Option

@@ -322,10 +322,10 @@

Defining Java Property Option

The last option to create is the Java property, and it is also created using the Option class' Builder.

Option property  = Option property  = Option.builder("D")
+

Option property = Option.builder("D")
                                 .hasArgs()
                                 .valueSeparator('=')
-                                .build();
+                                .get();

The map of properties specified by this option can later be retrieved by calling getOptionProperties("D") on the CommandLine. @@ -335,11 +335,11 @@

Defining Java Property Option

Creating the Options

Now that we have created each - Option we need + Option we need to create the - Options + Options instance. This is achieved using the - addOption + addOption method of Options.

Options options = new Options();
@@ -351,10 +351,10 @@ Creating the Options
 options.addOption(verbose);
 options.addOption(debug);
 options.addOption(emacs);
-options.addOption(logfile);
+options.addOption(logFile);
 options.addOption(logger);
 options.addOption(listener);
-options.addOption(buildfile);
+options.addOption(buildFile);
 options.addOption(find);
 options.addOption(property);

@@ -367,7 +367,7 @@

Creating the Parser

We now need to create a CommandLineParser. This will parse the command line arguments, using the rules specified by the Options and - return an instance of CommandLine. + return an instance of CommandLine.

public static void main(String[] args) {
     // create the parser
@@ -399,7 +399,7 @@ Displaying Usage and Help
         
           CLI also provides the means to automatically generate usage
           and help information.  This is achieved with the
-          HelpFormatter
+          HelpFormatter
           class.
         
         // automatically generate the help statement
@@ -454,7 +454,7 @@ Options for this example.
+        Options for this example.
       
       // create the command line parser
 CommandLineParser parser = new DefaultParser();
@@ -468,7 +468,7 @@ 

+          .get();

         
             The above will create an option that passes the string value to the Foo constructor when commandLine.getParsedOptionValue(fooOpt) is called.
         
@@ -595,12 +595,12 @@ Changing Usage Announcement
           }
           System.err.printf("ERROR: Option %s: %s%n", buf, o.getDeprecated());
       };
-      DefaultParser parser = DefaultParser.builder().setDeprecatedHandler(deprecatedUsageAnnouncement).build();
+      DefaultParser parser = DefaultParser.builder().setDeprecatedHandler(deprecatedUsageAnnouncement).get();
       CommandLine line;
       try {
           // parse the command line arguments
@@ -728,10 +728,10 @@ Changing help format
       7. Defining Option Properties
       
         The following are the properties that each 
-        Option has.  All of these
+        Option has.  All of these
         can be set using the accessors or using the methods
         defined in the
-        Option.Builder.
+        Option.Builder.
       
       
diff --git a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
index 4e54fb29f..6b3065664 100644
--- a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -147,6 +147,26 @@ void testPrintHelp() throws IOException {
         assertEquals(0, sb.length(), "Should not write to output");
     }
 
+    @Test
+    void testPrintHelpWithDefaults() throws IOException {
+        final StringBuilder sb = new StringBuilder();
+        final TextHelpAppendable serializer = new TextHelpAppendable(sb);
+        HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).get();
+
+        final Options options = new Options().addOption(Option.builder("a").since("1853").hasArg().desc("aaaa aaaa aaaa aaaa aaaa").get());
+
+        List expected = new ArrayList<>();
+        expected.add(" usage:  commandSyntax");
+        expected.add("");
+        expected.add(" Options      Since           Description       ");
+        expected.add(" -a      1853      aaaa aaaa aaaa aaaa aaaa");
+        expected.add("");
+
+        formatter.printHelp("commandSyntax", options);
+        List actual = IOUtils.readLines(new StringReader(sb.toString()));
+        assertEquals(expected, actual);
+    }
+
     /**
      * Tests example from the mailing list that caused an infinite loop.
      *

From 6f96173db9a274fb62c38dd9556d7109791f402c Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 11:34:25 +0000
Subject: [PATCH 105/163] Fix broken Javadoc links, replace deprecated methods
 in usage examples, and add a missing method to HelpFormatter (#424).

---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ac166cb70..4d5b6b8ea 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -27,6 +27,7 @@
       Fix broken Introduction links on the website #417.
       Fix malformed Javadoc comments.
       Correct HelpFormatter Javadoc #418.
+      Fix broken Javadoc links, replace deprecated methods in usage examples, and add a missing method to HelpFormatter (#424).
       
       
       Bump org.apache.commons:commons-parent from 91 to 102 #414, #416.

From 4f17487df0f1726078580758f700ffab0c3238a1 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 11:35:16 +0000
Subject: [PATCH 106/163] Bump next release label to feature level: 1.12.0

---
 pom.xml                 | 6 +++---
 src/changes/changes.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99b40b755..d7549092a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   4.0.0
   commons-cli
   commons-cli
-  1.11.1-SNAPSHOT
+  1.12.0-SNAPSHOT
   Apache Commons CLI
   2002
   
@@ -91,8 +91,8 @@
     1.8
     cli
     org.apache.commons.cli
-    1.11.1
-    1.11.2
+    1.12.0
+    1.12.1
     commons-cli-${commons.release.version}
     true
     RC1
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4d5b6b8ea..e09091558 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,7 @@
     Apache Commons CLI Release Notes
   
   
-    
+    
       
       Fix broken Introduction links on the website #417.
       Fix malformed Javadoc comments.

From 1119dbb53587e9a630699339fc49d955f4e57e47 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 11:35:55 +0000
Subject: [PATCH 107/163] Sort members

---
 .../commons/cli/help/HelpFormatterTest.java   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
index 6b3065664..24d8197bd 100644
--- a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -147,6 +147,19 @@ void testPrintHelp() throws IOException {
         assertEquals(0, sb.length(), "Should not write to output");
     }
 
+    /**
+     * Tests example from the mailing list that caused an infinite loop.
+     *
+     * @see [CLI-351] Multiple traililng BREAK_CHAR_SET characters cause infinite loop in
+     *      HelpFormatter
+     */
+    @Test
+    void testPrintHelpHeader() throws IOException {
+        HelpFormatter.builder().get().printHelp("CL syntax", "Header", Collections.emptyList(), "Footer", true);
+        HelpFormatter.builder().get().printHelp("CL syntax", "Header\n\n", // This makes printHelp enter into an infinite loop
+                Collections.emptyList(), "Footer", true);
+    }
+
     @Test
     void testPrintHelpWithDefaults() throws IOException {
         final StringBuilder sb = new StringBuilder();
@@ -167,19 +180,6 @@ void testPrintHelpWithDefaults() throws IOException {
         assertEquals(expected, actual);
     }
 
-    /**
-     * Tests example from the mailing list that caused an infinite loop.
-     *
-     * @see [CLI-351] Multiple traililng BREAK_CHAR_SET characters cause infinite loop in
-     *      HelpFormatter
-     */
-    @Test
-    void testPrintHelpHeader() throws IOException {
-        HelpFormatter.builder().get().printHelp("CL syntax", "Header", Collections.emptyList(), "Footer", true);
-        HelpFormatter.builder().get().printHelp("CL syntax", "Header\n\n", // This makes printHelp enter into an infinite loop
-                Collections.emptyList(), "Footer", true);
-    }
-
     @Test
     void testPrintHelpWithIterableOptions() throws IOException {
         final StringBuilder sb = new StringBuilder();

From 046d40a22452067903f24ef96afd056e6a7a7ce0 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 11:37:24 +0000
Subject: [PATCH 108/163] Use final

---
 .../java/org/apache/commons/cli/help/HelpFormatterTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
index 24d8197bd..04041f644 100644
--- a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -164,11 +164,11 @@ void testPrintHelpHeader() throws IOException {
     void testPrintHelpWithDefaults() throws IOException {
         final StringBuilder sb = new StringBuilder();
         final TextHelpAppendable serializer = new TextHelpAppendable(sb);
-        HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).get();
+        final HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).get();
 
         final Options options = new Options().addOption(Option.builder("a").since("1853").hasArg().desc("aaaa aaaa aaaa aaaa aaaa").get());
 
-        List expected = new ArrayList<>();
+        final List expected = new ArrayList<>();
         expected.add(" usage:  commandSyntax");
         expected.add("");
         expected.add(" Options      Since           Description       ");
@@ -176,7 +176,7 @@ void testPrintHelpWithDefaults() throws IOException {
         expected.add("");
 
         formatter.printHelp("commandSyntax", options);
-        List actual = IOUtils.readLines(new StringReader(sb.toString()));
+        final List actual = IOUtils.readLines(new StringReader(sb.toString()));
         assertEquals(expected, actual);
     }
 

From e1dd05a8473ae4f24af493574f9689bee044b69b Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 11:58:43 +0000
Subject: [PATCH 109/163] Javadoc

---
 .../java/org/apache/commons/cli/Converter.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/Converter.java b/src/main/java/org/apache/commons/cli/Converter.java
index 7e92c32f0..ce77869a7 100644
--- a/src/main/java/org/apache/commons/cli/Converter.java
+++ b/src/main/java/org/apache/commons/cli/Converter.java
@@ -37,27 +37,27 @@ public interface Converter {
     // See also Apache Commons Lang FailableFunction
 
     /**
-     * The default converter. Does nothing.
+     * The default converter does nothing.
      */
     Converter DEFAULT = s -> s;
 
     /**
-     * Class name converter. Calls {@link Class#forName(String)}.
+     * Converts a String to a {@link Class}. Calls {@link Class#forName(String)}.
      */
     Converter, ClassNotFoundException> CLASS = Class::forName;
 
     /**
-     * File name converter. Calls {@link File#File(String)}.
+     * Converts a String to a {@link File}. Calls {@link File#File(String)}.
      */
     Converter FILE = File::new;
 
     /**
-     * Path converter. Calls {@link Paths#get(java.net.URI)}.
+     * Converts a String to a {@link Path}. Calls {@link Paths#get(java.net.URI)}.
      */
     Converter PATH = Paths::get;
 
     /**
-     * Number converter. Converts to a Double if a decimal point ('.') is in the string or a Long otherwise.
+     * Converts a String to a {@link Number}. Converts to a Double if a decimal point ('.') is in the string or a Long otherwise.
      */
     Converter NUMBER = s -> s.indexOf('.') != -1 ? (Number) Double.valueOf(s) : (Number) Long.valueOf(s);
 
@@ -69,12 +69,12 @@ public interface Converter {
     Converter OBJECT = s -> CLASS.apply(s).getConstructor().newInstance();
 
     /**
-     * Creates a URL. Calls {@link URL#URL(String)}.
+     * Converts a String to a {@link URL}. Calls {@link URL#URL(String)}.
      */
     Converter URL = URL::new;
 
     /**
-     * Converts to a date using the format string Form "EEE MMM dd HH:mm:ss zzz yyyy".
+     * Converts a String to a {@link Date} using the format string Form "EEE MMM dd HH:mm:ss zzz yyyy".
      */
     Converter DATE = s -> new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").parse(s);
 

From 9f540c10e793563b854da5fa4208338041dc9ff8 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 12:00:46 +0000
Subject: [PATCH 110/163] Fix Javadoc reference

---
 src/main/java/org/apache/commons/cli/Converter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/cli/Converter.java b/src/main/java/org/apache/commons/cli/Converter.java
index ce77869a7..811a73bb2 100644
--- a/src/main/java/org/apache/commons/cli/Converter.java
+++ b/src/main/java/org/apache/commons/cli/Converter.java
@@ -52,7 +52,7 @@ public interface Converter {
     Converter FILE = File::new;
 
     /**
-     * Converts a String to a {@link Path}. Calls {@link Paths#get(java.net.URI)}.
+     * Converts a String to a {@link Path}. Calls {@link Paths#get(String, String...)}.
      */
     Converter PATH = Paths::get;
 

From 4eed3816eb91ebfc4f887f76f0dfd43563edaf32 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 12:03:49 +0000
Subject: [PATCH 111/163] Add ConverterTests.testDateLocaleDe()

---
 .../java/org/apache/commons/cli/ConverterTests.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index 8691d0757..278b9d556 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -26,12 +26,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.DefaultLocale;
 
 /**
  * Tests for standard Converters.
@@ -72,7 +74,7 @@ void testClass() throws Exception {
         assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply("foo.bar"));
         assertNotNull(Converter.CLASS.apply(AClassWithoutADefaultConstructor.class.getName()));
     }
-
+    
     @Test
     void testDate() throws Exception {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("whatever"));
@@ -91,6 +93,14 @@ void testDate() throws Exception {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Jun 06 17:48:57 EDT 2002"));
     }
 
+    @Test
+    @DefaultLocale(language = "de", country = "DE")
+    void testDateLocaleDe() throws Exception {
+        final Date expected = new Date(1023400137000L);
+        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        assertEquals(expected, Converter.DATE.apply(formatted));
+    }
+
     @Test
     void testFile() throws Exception {
         final URL url = this.getClass().getClassLoader().getResource("./org/apache/commons/cli/existing-readable.file");

From 22d985c42531098fec3b6ead51b09921f74a751a Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 27 Jun 2026 12:04:52 +0000
Subject: [PATCH 112/163] Reduce vertical whitespace.

---
 .../apache/commons/cli/ConverterTests.java    | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index 278b9d556..adfec60f5 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -14,6 +14,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   See the License for the specific language governing permissions and
   limitations under the License.
  */
+
 package org.apache.commons.cli;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,7 +27,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -42,13 +42,13 @@ public class ConverterTests {
 
     // A class without a default constructor.
     public class AClassWithoutADefaultConstructor {
+
         public AClassWithoutADefaultConstructor(final int i) {
         }
     }
 
     private static Stream numberTestParameters() {
         final List lst = new ArrayList<>();
-
         lst.add(Arguments.of("123", Long.valueOf("123")));
         lst.add(Arguments.of("12.3", Double.valueOf("12.3")));
         lst.add(Arguments.of("-123", Long.valueOf("-123")));
@@ -58,38 +58,30 @@ private static Stream numberTestParameters() {
         lst.add(Arguments.of("0x5F", null));
         lst.add(Arguments.of("2,3", null));
         lst.add(Arguments.of("1.2.3", null));
-
         return lst.stream();
     }
 
     @Test
     void testClass() throws Exception {
-
         assertNotNull(Converter.CLASS.apply(this.getClass().getName()), this.getClass().getName());
         assertNotNull(Converter.CLASS.apply(this.getClass().getCanonicalName()), this.getClass().getCanonicalName());
-        assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply(this.getClass().getSimpleName()),
-                this.getClass().getSimpleName());
+        assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply(this.getClass().getSimpleName()), this.getClass().getSimpleName());
         assertNotNull(Converter.CLASS.apply(this.getClass().getTypeName()), this.getClass().getTypeName());
-
         assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply("foo.bar"));
         assertNotNull(Converter.CLASS.apply(AClassWithoutADefaultConstructor.class.getName()));
     }
-    
+
     @Test
     void testDate() throws Exception {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("whatever"));
-
         /*
-         * Dates calculated from strings are dependent upon configuration and environment settings for the
-         * machine on which the test is running.  To avoid this problem, convert the time into a string
-         * and then unparse that using the converter.  This produces strings that always match the correct
-         * time zone.
+         * Dates calculated from strings are dependent upon configuration and environment settings for the machine on which the test is running. To avoid this
+         * problem, convert the time into a string and then unparse that using the converter. This produces strings that always match the correct time zone.
          */
         final Date expected = new Date(1023400137000L);
         final DateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
         final String formatted = dateFormat.format(expected);
         assertEquals(expected, Converter.DATE.apply(formatted));
-
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Jun 06 17:48:57 EDT 2002"));
     }
 
@@ -122,10 +114,8 @@ void testNumber(final String str, final Number expected) throws Exception {
     void testObject() throws Exception {
         assertNotNull(Converter.OBJECT.apply(this.getClass().getName()), this.getClass().getName());
         assertNotNull(Converter.OBJECT.apply(this.getClass().getCanonicalName()), this.getClass().getCanonicalName());
-        assertThrows(ClassNotFoundException.class, () -> Converter.OBJECT.apply(this.getClass().getSimpleName()),
-                this.getClass().getSimpleName());
+        assertThrows(ClassNotFoundException.class, () -> Converter.OBJECT.apply(this.getClass().getSimpleName()), this.getClass().getSimpleName());
         assertNotNull(Converter.OBJECT.apply(this.getClass().getTypeName()), this.getClass().getTypeName());
-
         assertThrows(ClassNotFoundException.class, () -> Converter.OBJECT.apply("foo.bar"));
         assertThrows(NoSuchMethodException.class, () -> Converter.OBJECT.apply(AClassWithoutADefaultConstructor.class.getName()));
     }

From f3ba9c9518edf3702a8d06d211a91959611ff413 Mon Sep 17 00:00:00 2001
From: "Dexter.k" <164054284+rootvector2@users.noreply.github.com>
Date: Sun, 28 Jun 2026 15:08:19 +0000
Subject: [PATCH 113/163] Use Locale.ENGLISH when parsing dates in
 Converter.DATE (#426)

* parse Converter.DATE with default locale, fall back to Locale.ENGLISH

* No copy-pasta.

---------

Co-authored-by: Gary Gregory 
---
 src/main/java/org/apache/commons/cli/Converter.java  | 12 +++++++++++-
 .../java/org/apache/commons/cli/ConverterTests.java  | 11 +++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/cli/Converter.java b/src/main/java/org/apache/commons/cli/Converter.java
index 811a73bb2..bc1212838 100644
--- a/src/main/java/org/apache/commons/cli/Converter.java
+++ b/src/main/java/org/apache/commons/cli/Converter.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * The definition of the functional interface to call when doing a conversion. Like {@code Function} but can throw an Exception.
@@ -76,7 +77,16 @@ public interface Converter {
     /**
      * Converts a String to a {@link Date} using the format string Form "EEE MMM dd HH:mm:ss zzz yyyy".
      */
-    Converter DATE = s -> new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").parse(s);
+    Converter DATE = s -> {
+        final String pattern = "EEE MMM dd HH:mm:ss zzz yyyy";
+        try {
+            return new SimpleDateFormat(pattern).parse(s);
+        } catch (final java.text.ParseException e) {
+            // Date.toString() always emits English month/day names, so fall back to Locale.ENGLISH
+            // when the default locale rejects the documented format.
+            return new SimpleDateFormat(pattern, Locale.ENGLISH).parse(s);
+        }
+    };
 
     /**
      * Applies the conversion function to the String argument.
diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index adfec60f5..a92a13558 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
@@ -93,6 +94,16 @@ void testDateLocaleDe() throws Exception {
         assertEquals(expected, Converter.DATE.apply(formatted));
     }
 
+    @Test
+    @DefaultLocale(language = "de", country = "DE")
+    void testDateLocaleDeEnglishInput() throws Exception {
+        // Date.toString() always emits English month/day names, so the converter must still parse
+        // them when the default locale is not English.
+        final Date expected = new Date(1023400137000L);
+        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH).format(expected);
+        assertEquals(expected, Converter.DATE.apply(formatted));
+    }
+
     @Test
     void testFile() throws Exception {
         final URL url = this.getClass().getClassLoader().getResource("./org/apache/commons/cli/existing-readable.file");

From 03148b8ac20045053a2c1c561d69830bc6217d04 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sun, 28 Jun 2026 15:12:02 +0000
Subject: [PATCH 114/163] Use Locale.ENGLISH when parsing dates in
 Converter.DATE (#426).

---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e09091558..5446931a1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -28,6 +28,7 @@
       Fix malformed Javadoc comments.
       Correct HelpFormatter Javadoc #418.
       Fix broken Javadoc links, replace deprecated methods in usage examples, and add a missing method to HelpFormatter (#424).
+      Use Locale.ENGLISH when parsing dates in Converter.DATE (#426).
       
       
       Bump org.apache.commons:commons-parent from 91 to 102 #414, #416.

From d2532425eed5acf716724fc79fdfae90054e4f35 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sun, 28 Jun 2026 15:12:13 +0000
Subject: [PATCH 115/163] Use final.

---
 .../java/org/apache/commons/cli/help/AbstractHelpFormatter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java b/src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java
index 3325886cb..cf0c6ee02 100644
--- a/src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java
+++ b/src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java
@@ -309,7 +309,7 @@ public void printHelp(final String cmdLineSyntax, final Options options) throws
      */
     public void printHelp(final String cmdLineSyntax, final String header, final Iterable

From 07ca2bb8c5b49053cac416cb960ba175c7ea2546 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 25 Jul 2026 09:49:05 -0400
Subject: [PATCH 137/163] Bump actions/checkout from 7.0.0 to 7.0.1

---
 .github/workflows/codeql-analysis.yml   | 2 +-
 .github/workflows/dependency-review.yml | 2 +-
 .github/workflows/maven.yml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cc77d8ec2..66839decc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
         persist-credentials: false
     - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 #v6.1.0
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 7bc02bdd2..4c17443c9 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -26,6 +26,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: 'Dependency Review PR'
         uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e28b58c42..224593f40 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -41,7 +41,7 @@ jobs:
 #              experimental: true
 
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
         persist-credentials: false
     - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 #v6.1.0

From 2fb8cb4e807932f0d28a49622239489501a6d550 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sun, 26 Jul 2026 10:56:10 -0400
Subject: [PATCH 138/163] Extract into final local variable.

---
 src/main/java/org/apache/commons/cli/help/Util.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/help/Util.java b/src/main/java/org/apache/commons/cli/help/Util.java
index 76d584f3c..921f9ad78 100644
--- a/src/main/java/org/apache/commons/cli/help/Util.java
+++ b/src/main/java/org/apache/commons/cli/help/Util.java
@@ -54,10 +54,11 @@ static int indexOfNonWhitespace(final CharSequence text, final int startPos) {
         }
         // the line ends before the max wrap pos or a new line char found
         int idx = startPos;
-        while (idx < text.length() && isWhitespace(text.charAt(idx))) {
+        final int length = text.length();
+        while (idx < length && isWhitespace(text.charAt(idx))) {
             idx++;
         }
-        return idx < text.length() ? idx : NOT_FOUND;
+        return idx < length ? idx : NOT_FOUND;
     }
 
     /**

From b00e1b808ad8754172e23354dd7edbb8b8a155ab Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Tue, 28 Jul 2026 10:09:45 -0400
Subject: [PATCH 139/163] Bump github/codeql-action from 4.37.1 to 4.37.3

---
 .github/workflows/codeql-analysis.yml     | 6 +++---
 .github/workflows/scorecards-analysis.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 66839decc..03e6564a5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -58,7 +58,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@e0647621c2984b5ed2f768cb892365bf2a616ad1 # 4.37.2
+      uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -69,7 +69,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@e0647621c2984b5ed2f768cb892365bf2a616ad1 # 4.37.2
+      uses: github/codeql-action/autobuild@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -83,4 +83,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@e0647621c2984b5ed2f768cb892365bf2a616ad1 # 4.37.2
+      uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index cf1c14143..659237ec1 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -64,6 +64,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e0647621c2984b5ed2f768cb892365bf2a616ad1 # 4.37.2
+        uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
         with:
           sarif_file: results.sarif

From 4a017aeb90578f74f9ae44bc27605bd0cd55ae79 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Wed, 29 Jul 2026 07:46:17 -0400
Subject: [PATCH 140/163] Add Java 28-ea to GH CI as an experimental build.

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 224593f40..389d56d13 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -37,8 +37,8 @@ jobs:
         include:
             - java: 27-ea
               experimental: true
-#            - java: 27-ea
-#              experimental: true
+            - java: 28-ea
+              experimental: true
 
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

From eb12edb42fdcc53e9df235e3444df738b85129c4 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Wed, 29 Jul 2026 07:48:45 -0400
Subject: [PATCH 141/163] Bump GH CI actions/checkout from 7.0.0 to 7.0.1

---
 .github/workflows/scorecards-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index 659237ec1..9b0a47773 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -40,7 +40,7 @@ jobs:
     steps:
 
       - name: "Checkout code"
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # 7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
 

From e17738bb9407f45fa5989bb36fccdfa7fbc32c6f Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Wed, 29 Jul 2026 07:50:56 -0400
Subject: [PATCH 142/163] Bump ossf/scorecard-action from 2.4.3 to 2.4.4.

---
 .github/workflows/scorecards-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index 9b0a47773..acd669280 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -45,7 +45,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a    # 2.4.3
+        uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc #2.4.4
         with:
           results_file: results.sarif
           results_format: sarif

From bf0512470241e410adb2ee011e0b973b7a0605e4 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 1 Aug 2026 13:48:21 -0400
Subject: [PATCH 143/163] Fix formatting of examples in the user guide.

---
 src/main/javadoc/overview.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 6c142b239..f0f9d58bd 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -172,8 +172,8 @@ Parsing the command line arguments
           of the CommandLineParser interface, the recommended one is the
           DefaultParser.
         
-        CommandLineParser parser = new DefaultParser();
-CommandLine cmd = parser.parse(options, args);
+        CommandLineParser parser = new DefaultParser();
+CommandLine cmd = parser.parse(options, args);
         
           Now we need to check if the t option is present.  To do
           this we will interrogate the 
@@ -183,7 +183,7 @@ 
Parsing the command line arguments
           represented by the java.lang.String is present, otherwise 
           it returns false.
         
-        if(cmd.hasOption("t")) {
+        if (cmd.hasOption("t")) {
     // print the date and time
 } else {
     // print the date
@@ -232,7 +232,7 @@ Retrieving the argument value
         // get c option value
 String countryCode = cmd.getOptionValue("c");
 
-if(countryCode == null) {
+if (countryCode == null) {
     // print default date
 } else {
     // print date for country specified by countryCode

From db57942a6a593ebf2be28172a22a2f1db6bdccb9 Mon Sep 17 00:00:00 2001
From: farkhalit rida 
Date: Sat, 1 Aug 2026 23:40:24 +0530
Subject: [PATCH 144/163] Reject an empty option name in getMatchingOptions
 (#434)

* reject an empty option name in getMatchingOptions

An empty name after hyphen stripping matched every long option, so the token "--=value" bound the value to a long option that was never named.

* Document and test null-tolerant getMatchingOptions

Signed-off-by: farkhalit rida 

* Update Javadoc for getMatchingOptions method

---------

Signed-off-by: farkhalit rida 
Co-authored-by: Gary Gregory 
---
 src/main/java/org/apache/commons/cli/Options.java  |  8 ++++++--
 .../java/org/apache/commons/cli/OptionsTest.java   | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
index 40d8b1103..dcb6b52b4 100644
--- a/src/main/java/org/apache/commons/cli/Options.java
+++ b/src/main/java/org/apache/commons/cli/Options.java
@@ -212,13 +212,17 @@ public Options addRequiredOption(final String opt, final String longOpt, final b
     /**
      * Gets the options with a long name starting with the name specified.
      *
-     * @param opt The partial name of the option.
-     * @return The options matching the partial name specified, or an empty list if none matches.
+     * @param opt The partial name of the option, may be {@code null}.
+     * @return The options matching the partial name specified, or an empty list if none matches or the name is null or empty.
      * @since 1.3
      */
     public List getMatchingOptions(final String opt) {
         final String clean = Util.stripLeadingHyphens(opt);
         final List matchingOpts = new ArrayList<>();
+        // a null or empty name is not a partial name; empty would match every long option
+        if (Util.isEmpty(clean)) {
+            return matchingOpts;
+        }
         // for a perfect match return the single option only
         if (longOpts.containsKey(clean)) {
             return Collections.singletonList(clean);
diff --git a/src/test/java/org/apache/commons/cli/OptionsTest.java b/src/test/java/org/apache/commons/cli/OptionsTest.java
index f0ac95258..d6b2f4667 100644
--- a/src/test/java/org/apache/commons/cli/OptionsTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionsTest.java
@@ -182,6 +182,20 @@ void testGetMatchingOpts() {
         assertToStrings(options.getOption("verbose"));
     }
 
+    @Test
+    void testGetMatchingOptsEmptyName() throws Exception {
+        final Options options = new Options();
+        options.addOption(Option.builder("c").longOpt("config-file").hasArg().get());
+        assertTrue(options.getMatchingOptions(null).isEmpty());
+        assertTrue(options.getMatchingOptions("").isEmpty());
+        assertTrue(options.getMatchingOptions("-").isEmpty());
+        assertTrue(options.getMatchingOptions("--").isEmpty());
+        // "--=value" names no option, so it must not bind a value to config-file
+        for (final CommandLineParser parser : new CommandLineParser[] { new DefaultParser(), new PosixParser() }) {
+            assertThrows(UnrecognizedOptionException.class, () -> parser.parse(options, new String[] { "--=/etc/shadow" }));
+        }
+    }
+
     @Test
     void testGetOptionsGroups() {
         final Options options = new Options();

From c9ffd67e1d6185fdfb833a6b08b265235cef6817 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 1 Aug 2026 14:11:57 -0400
Subject: [PATCH 145/163] Reject an empty option name in getMatchingOptions
 (#434).

Javadoc
---
 src/changes/changes.xml                           | 1 +
 src/main/java/org/apache/commons/cli/Options.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3353229f2..dbccb62e2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,7 @@
       Use Locale.ENGLISH when parsing dates in Converter.DATE (#426).
       Reject non-BMP code points in the Character type converter (#425).
       Reject invalid dates in Converter.DATE (#430).
+      Reject an empty option name in getMatchingOptions (#434).
       
       
       Bump org.apache.commons:commons-parent from 91 to 103 #414, #416.
diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
index dcb6b52b4..9d76967ac 100644
--- a/src/main/java/org/apache/commons/cli/Options.java
+++ b/src/main/java/org/apache/commons/cli/Options.java
@@ -213,7 +213,7 @@ public Options addRequiredOption(final String opt, final String longOpt, final b
      * Gets the options with a long name starting with the name specified.
      *
      * @param opt The partial name of the option, may be {@code null}.
-     * @return The options matching the partial name specified, or an empty list if none matches or the name is null or empty.
+     * @return A list of matching long option names, or an empty list if no matches were found.
      * @since 1.3
      */
     public List getMatchingOptions(final String opt) {

From 4dec263d684f03065bee21efe477d2bb33134cf0 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 1 Aug 2026 14:19:00 -0400
Subject: [PATCH 146/163] Refactor stream processing

---
 src/main/java/org/apache/commons/cli/Options.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
index 9d76967ac..9088a389b 100644
--- a/src/main/java/org/apache/commons/cli/Options.java
+++ b/src/main/java/org/apache/commons/cli/Options.java
@@ -25,6 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Main entry-point into the library.
@@ -227,12 +228,7 @@ public List getMatchingOptions(final String opt) {
         if (longOpts.containsKey(clean)) {
             return Collections.singletonList(clean);
         }
-        longOpts.keySet().forEach(longOpt -> {
-            if (longOpt.startsWith(clean)) {
-                matchingOpts.add(longOpt);
-            }
-        });
-        return matchingOpts;
+        return longOpts.keySet().stream().filter(s -> s.startsWith(clean)).collect(Collectors.toList());
     }
 
     /**

From 7d77ecce8b11763b7282d6b40dffdb4ce8e85668 Mon Sep 17 00:00:00 2001
From: farkhalit rida 
Date: Sat, 1 Aug 2026 23:56:36 +0530
Subject: [PATCH 147/163] Reject trailing text after the date in Converter.DATE
 (#435)

* reject trailing text after the date in Converter.DATE

* Only fall back to English locale when the date fails to parse

Restrict the English retry to when the default-locale parse matches nothing;
a partial match is a trailing-text failure and now throws with the parse
position instead of retrying and reporting a misleading offset.
---
 .../org/apache/commons/cli/Converter.java     | 22 ++++++++++++++-----
 .../apache/commons/cli/ConverterTests.java    | 18 +++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/Converter.java b/src/main/java/org/apache/commons/cli/Converter.java
index fcb9c43b5..1faf78174 100644
--- a/src/main/java/org/apache/commons/cli/Converter.java
+++ b/src/main/java/org/apache/commons/cli/Converter.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -82,15 +83,26 @@ public interface Converter {
         final SimpleDateFormat format = new SimpleDateFormat(pattern);
         // reject out-of-range fields (for example "Feb 30") instead of silently rolling them over.
         format.setLenient(false);
-        try {
-            return format.parse(s);
-        } catch (final java.text.ParseException e) {
+        // SimpleDateFormat.parse(String) stops at the first character it cannot use and ignores any
+        // trailing text, so " garbage" would be accepted. Parse from an explicit position
+        // and reject the value unless the whole string is consumed.
+        final ParsePosition pos = new ParsePosition(0);
+        Date date = format.parse(s, pos);
+        if (date == null) {
             // Date.toString() always emits English month/day names, so fall back to Locale.ENGLISH
-            // when the default locale rejects the documented format.
+            // when the default locale rejects the documented format. Only retry when the default
+            // locale matched nothing; a partial match is a trailing-text failure, handled below.
             final SimpleDateFormat englishFormat = new SimpleDateFormat(pattern, Locale.ENGLISH);
             englishFormat.setLenient(false);
-            return englishFormat.parse(s);
+            pos.setIndex(0);
+            pos.setErrorIndex(-1);
+            date = englishFormat.parse(s, pos);
         }
+        if (date == null || pos.getIndex() != s.length()) {
+            final int errorIndex = pos.getErrorIndex() >= 0 ? pos.getErrorIndex() : pos.getIndex();
+            throw new java.text.ParseException(String.format("Unparseable date: \"%s\"", s), errorIndex);
+        }
+        return date;
     };
 
     /**
diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index 1f5efad55..64052c41d 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -86,6 +86,24 @@ void testDate() throws Exception {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Jun 06 17:48:57 EDT 2002"));
     }
 
+    @Test
+    void testDateRejectsTrailingText() throws Exception {
+        final Date expected = new Date(1023400137000L);
+        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
+    }
+
+    @Test
+    @DefaultLocale(language = "de", country = "DE")
+    void testDateRejectsTrailingTextLocaleDe() throws Exception {
+        // Trailing text must be rejected even when a non-English default locale parses the date, and
+        // the reported error position should point past the parsed date rather than at index 0.
+        final Date expected = new Date(1023400137000L);
+        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        final java.text.ParseException e = assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
+        assertEquals(formatted.length(), e.getErrorOffset());
+    }
+
     @Test
     @DefaultLocale(language = "de", country = "DE")
     void testDateLocaleDe() throws Exception {

From a1ee9b97884cf32cf76f1bb5b8d0c47eb4487e96 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 1 Aug 2026 14:27:54 -0400
Subject: [PATCH 148/163] Add sanity check assertions in ConverterTests

---
 src/test/java/org/apache/commons/cli/ConverterTests.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index 64052c41d..1f6690f76 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -90,6 +90,7 @@ void testDate() throws Exception {
     void testDateRejectsTrailingText() throws Exception {
         final Date expected = new Date(1023400137000L);
         final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        assertEquals(expected, Converter.DATE.apply(formatted));
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
     }
 
@@ -100,6 +101,7 @@ void testDateRejectsTrailingTextLocaleDe() throws Exception {
         // the reported error position should point past the parsed date rather than at index 0.
         final Date expected = new Date(1023400137000L);
         final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        assertEquals(expected, Converter.DATE.apply(formatted));
         final java.text.ParseException e = assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
         assertEquals(formatted.length(), e.getErrorOffset());
     }

From a7da9615fa8895d083cccedc7a59cbc1a499ca37 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 1 Aug 2026 14:29:05 -0400
Subject: [PATCH 149/163] Reject trailing text after the date in Converter.DATE
 (#435).

Sort members
---
 src/changes/changes.xml                       |  1 +
 .../apache/commons/cli/ConverterTests.java    | 40 +++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index dbccb62e2..f952bc4c5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -32,6 +32,7 @@
       Reject non-BMP code points in the Character type converter (#425).
       Reject invalid dates in Converter.DATE (#430).
       Reject an empty option name in getMatchingOptions (#434).
+      Reject trailing text after the date in Converter.DATE (#435).
       
       
       Bump org.apache.commons:commons-parent from 91 to 103 #414, #416.
diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index 1f6690f76..57cb63f99 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -86,26 +86,6 @@ void testDate() throws Exception {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Jun 06 17:48:57 EDT 2002"));
     }
 
-    @Test
-    void testDateRejectsTrailingText() throws Exception {
-        final Date expected = new Date(1023400137000L);
-        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
-        assertEquals(expected, Converter.DATE.apply(formatted));
-        assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
-    }
-
-    @Test
-    @DefaultLocale(language = "de", country = "DE")
-    void testDateRejectsTrailingTextLocaleDe() throws Exception {
-        // Trailing text must be rejected even when a non-English default locale parses the date, and
-        // the reported error position should point past the parsed date rather than at index 0.
-        final Date expected = new Date(1023400137000L);
-        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
-        assertEquals(expected, Converter.DATE.apply(formatted));
-        final java.text.ParseException e = assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
-        assertEquals(formatted.length(), e.getErrorOffset());
-    }
-
     @Test
     @DefaultLocale(language = "de", country = "DE")
     void testDateLocaleDe() throws Exception {
@@ -132,6 +112,26 @@ void testDateRejectsInvalid() {
         assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Mon Jan 32 00:00:00 UTC 2024"));
     }
 
+    @Test
+    void testDateRejectsTrailingText() throws Exception {
+        final Date expected = new Date(1023400137000L);
+        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        assertEquals(expected, Converter.DATE.apply(formatted));
+        assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
+    }
+
+    @Test
+    @DefaultLocale(language = "de", country = "DE")
+    void testDateRejectsTrailingTextLocaleDe() throws Exception {
+        // Trailing text must be rejected even when a non-English default locale parses the date, and
+        // the reported error position should point past the parsed date rather than at index 0.
+        final Date expected = new Date(1023400137000L);
+        final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+        assertEquals(expected, Converter.DATE.apply(formatted));
+        final java.text.ParseException e = assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
+        assertEquals(formatted.length(), e.getErrorOffset());
+    }
+
     @Test
     void testFile() throws Exception {
         final URL url = this.getClass().getClassLoader().getResource("./org/apache/commons/cli/existing-readable.file");

From 05bad67d53dba6d0f7de05d2db405f0eab1fee33 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sun, 2 Aug 2026 15:49:56 -0400
Subject: [PATCH 150/163] Javadoc

---
 src/main/java/org/apache/commons/cli/HelpFormatter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/HelpFormatter.java b/src/main/java/org/apache/commons/cli/HelpFormatter.java
index 91d5b2bb8..361788054 100644
--- a/src/main/java/org/apache/commons/cli/HelpFormatter.java
+++ b/src/main/java/org/apache/commons/cli/HelpFormatter.java
@@ -418,7 +418,7 @@ private void appendOptionGroup(final StringBuilder buff, final OptionGroup optio
      * @param leftPad The number of characters of padding to be prefixed to each line
      * @param descPad The number of characters of padding to be prefixed to each description line
      * @return The StringBuffer with the rendered Options contents.
-     * @throws IOException if an I/O error occurs.
+     * @throws IOException Thrown if an I/O error occurs.
      */
      A appendOptions(final A sb, final int width, final Options options, final int leftPad, final int descPad) throws IOException {
         final String lpad = createPadding(leftPad);
@@ -502,7 +502,7 @@  A appendOptions(final A sb, final int width, final Option
      * @param nextLineTabStop The position on the next line for the first tab.
      * @param text The text to be rendered.
      * @return The StringBuffer with the rendered Options contents.
-     * @throws IOException if an I/O error occurs.
+     * @throws IOException Thrown if an I/O error occurs.
      */
      A appendWrappedText(final A appendable, final int width, final int nextLineTabStop, final String text) throws IOException {
         if (width <= 0) {

From 2d90efabcc1b1b5fddfe4c5f0c8de95c1b8ab957 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Tue, 4 Aug 2026 13:56:49 -0400
Subject: [PATCH 151/163] Bump github/codeql-action from 4.37.3 to 4.37.6

---
 .github/workflows/codeql-analysis.yml     | 6 +++---
 .github/workflows/scorecards-analysis.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 03e6564a5..38e64244a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -58,7 +58,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
+      uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -69,7 +69,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
+      uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -83,4 +83,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
+      uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index acd669280..7c2b151b4 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -64,6 +64,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # 4.37.3
+        uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
         with:
           sarif_file: results.sarif

From f8f1a28bc190388fbc1a22ac8a84e04c7b91a737 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Wed, 5 Aug 2026 14:11:47 -0400
Subject: [PATCH 152/163] Bump actions/setup-java from 5.6.0 to 5.7.0

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 389d56d13..f3235a887 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -51,7 +51,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # 5.6.0
+      uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # 5.7.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

From dc69e8423b163da5fca292e2bf9d6482ec6202f0 Mon Sep 17 00:00:00 2001
From: Naveed Khan <164054284+rootvector2@users.noreply.github.com>
Date: Sat, 8 Aug 2026 12:47:36 +0000
Subject: [PATCH 153/163] Fix integer overflow in
 TextHelpAppendable.indexOfWrap (#437)

* fix integer overflow in TextHelpAppendable.indexOfWrap

startPos + width overflowed to a negative value when width is Integer.MAX_VALUE (the default TextStyle.UNSET_MAX_WIDTH), so indexOfWrap returned a negative wrap position and makeColumnQueue threw StringIndexOutOfBoundsException. Compute the wrap boundary as a long.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Gary Gregory 
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../org/apache/commons/cli/help/TextHelpAppendable.java  | 9 ++++++---
 .../apache/commons/cli/help/TextHelpAppendableTest.java  | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java b/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java
index 14c90c7c2..2b053106c 100644
--- a/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java
+++ b/src/main/java/org/apache/commons/cli/help/TextHelpAppendable.java
@@ -76,19 +76,22 @@ public static int indexOfWrap(final CharSequence text, final int width, final in
         if (width < 1) {
             throw new IllegalArgumentException("Width must be greater than 0");
         }
+        // width can be Integer.MAX_VALUE (TextStyle.UNSET_MAX_WIDTH), so keep the wrap boundary in a long;
+        // startPos + width as an int overflows to a negative value and yields a negative wrap index.
+        final long end = (long) startPos + width;
         // handle case of width > text.
         // the line ends before the max wrap pos or a new line char found
-        int limit = Math.min(startPos + width, text.length());
+        int limit = (int) Math.min(end, text.length());
         for (int idx = startPos; idx < limit; idx++) {
             if (BREAK_CHAR_SET.contains(text.charAt(idx))) {
                 return idx;
             }
         }
-        if (startPos + width >= text.length()) {
+        if (end >= text.length()) {
             return text.length();
         }
 
-        limit = Math.min(startPos + width, text.length() - 1);
+        limit = (int) Math.min(end, text.length() - 1);
         int pos;
         // look for the last whitespace character before limit
         for (pos = limit; pos >= startPos; --pos) {
diff --git a/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java b/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
index 9c58427d5..182cf50fc 100644
--- a/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
+++ b/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
@@ -280,6 +280,10 @@ void testindexOfWrapPos() {
 
         assertThrows(IllegalArgumentException.class, () -> TextHelpAppendable.indexOfWrap("", 0, 0));
         assertEquals(3, TextHelpAppendable.indexOfWrap("Hello", 4, 0));
+
+        // startPos + width must not overflow when width is TextStyle.UNSET_MAX_WIDTH
+        assertEquals(30, TextHelpAppendable.indexOfWrap(testString, TextStyle.UNSET_MAX_WIDTH, 0), "did not find break character with unbounded width");
+        assertEquals(testString.length(), TextHelpAppendable.indexOfWrap(testString, TextStyle.UNSET_MAX_WIDTH, 31), "overflow produced a negative wrap index");
     }
 
     @ParameterizedTest

From aa0d4d3446c63db3e6c1bff6d6dac4b32b019a5f Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 8 Aug 2026 08:50:35 -0400
Subject: [PATCH 154/163] Fix integer overflow in
 TextHelpAppendable.indexOfWrap (#437).

---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f952bc4c5..da9d4ff1b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -33,6 +33,7 @@
       Reject invalid dates in Converter.DATE (#430).
       Reject an empty option name in getMatchingOptions (#434).
       Reject trailing text after the date in Converter.DATE (#435).
+      Fix integer overflow in TextHelpAppendable.indexOfWrap (#437).
       
       
       Bump org.apache.commons:commons-parent from 91 to 103 #414, #416.

From a6fb2b6f733f6107737bc6aba655f3326a147c73 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 8 Aug 2026 08:58:32 -0400
Subject: [PATCH 155/163] Add missing action in changes.xml.

---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index da9d4ff1b..0f31bf9e6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -35,6 +35,7 @@
       Reject trailing text after the date in Converter.DATE (#435).
       Fix integer overflow in TextHelpAppendable.indexOfWrap (#437).
       
+      Add AbstractHelpFormatter.printHelp(String, Options).
       
       Bump org.apache.commons:commons-parent from 91 to 103 #414, #416.
       [test] Bump org.apache.commons:commons-text from 1.14.0 to 1.15.0.

From a98d307261347ee11d2f9c4f43693db31fc0a392 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 8 Aug 2026 09:10:10 -0400
Subject: [PATCH 156/163] Javadoc

---
 .../org/apache/commons/cli/DefaultParser.java | 144 ++++++++----------
 1 file changed, 67 insertions(+), 77 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java b/src/main/java/org/apache/commons/cli/DefaultParser.java
index 9f9285d78..4dd7dfec2 100644
--- a/src/main/java/org/apache/commons/cli/DefaultParser.java
+++ b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -35,15 +35,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class DefaultParser implements CommandLineParser {
 
     /**
-     * A nested builder class to create {@code DefaultParser} instances
-     * using descriptive methods.
+     * A nested builder class to create {@code DefaultParser} instances using descriptive methods. Example usage:
      *
-     * Example usage:
      * -     * DefaultParser parser = Option.builder()
-     *     .setAllowPartialMatching(false)
-     *     .setStripLeadingAndTrailingQuotes(false)
-     *     .build();
+     *
+     * DefaultParser parser = Option.builder().setAllowPartialMatching(false).setStripLeadingAndTrailingQuotes(false).build();
      * 
      *
      * @since 1.5.0
@@ -110,7 +106,7 @@ public DefaultParser get() {
          * }

          * 
          * If "partial matching" is turned on, {@code -de} only matches the {@code "debug"} option. However, with "partial matching" disabled, {@code -de} would
-         * enable both {@code debug} as well as {@code extract}
+         * enable both {@code debug} as well as {@code extract}.
          * 
          *
          * @param allowPartialMatching whether to allow partial matching of long options.
@@ -136,7 +132,6 @@ public Builder setDeprecatedHandler(final Consumer

      *
-     * with "partial matching" turned on, {@code -de} only matches the {@code "debug"} option. However, with
-     * "partial matching" disabled, {@code -de} would enable both {@code debug} as well as {@code extract}
-     * options.
+     * with "partial matching" turned on, {@code -de} only matches the {@code "debug"} option. However, with "partial matching" disabled, {@code -de} would
+     * enable both {@code debug} as well as {@code extract} options.
      */
     public DefaultParser() {
         this.allowPartialMatching = true;
@@ -281,20 +270,20 @@ public DefaultParser() {
      * 
      * By "partial matching" we mean that given the following code:
      * 
+     *
      * {@code
-     *     final Options options = new Options();
-     *     options.addOption(new Option("d", "debug", false, "Turn on debug."));
-     *     options.addOption(new Option("e", "extract", false, "Turn on extract."));
-     *     options.addOption(new Option("o", "option", true, "Turn on option with argument."));
+     * final Options options = new Options();
+     * options.addOption(new Option("d", "debug", false, "Turn on debug."));
+     * options.addOption(new Option("e", "extract", false, "Turn on extract."));
+     * options.addOption(new Option("o", "option", true, "Turn on option with argument."));
      * }
      * 
      * 
-     * with "partial matching" turned on, {@code -de} only matches the {@code "debug"} option. However, with
-     * "partial matching" disabled, {@code -de} would enable both {@code debug} as well as {@code extract}
-     * options.
+     * with "partial matching" turned on, {@code -de} only matches the {@code "debug"} option. However, with "partial matching" disabled, {@code -de} would
+     * enable both {@code debug} as well as {@code extract} options.
      * 
      *
-     * @param allowPartialMatching if partial matching of long options shall be enabled
+     * @param allowPartialMatching if partial matching of long options shall be enabled.
      */
     public DefaultParser(final boolean allowPartialMatching) {
         this.allowPartialMatching = allowPartialMatching;
@@ -303,11 +292,10 @@ public DefaultParser(final boolean allowPartialMatching) {
     }
 
     /**
-     * Creates a new DefaultParser instance with the specified partial matching and quote
-     * stripping policy.
+     * Creates a new DefaultParser instance with the specified partial matching and quote stripping policy.
      *
-     * @param allowPartialMatching if partial matching of long options shall be enabled
-     * @param stripLeadingAndTrailingQuotes if balanced outer double quoutes should be stripped
+     * @param allowPartialMatching          if partial matching of long options shall be enabled.
+     * @param stripLeadingAndTrailingQuotes if balanced outer double quoutes should be stripped.
      */
     private DefaultParser(final boolean allowPartialMatching, final Boolean stripLeadingAndTrailingQuotes, final Consumer      * -S -SV -S V -S=V -S1S2 -S1S2 V -SV1=V2
      *
@@ -563,7 +550,6 @@ private void handleShortAndLongOption(final String hyphenToken) throws ParseExce
             } else {
                 // look for a long prefix (-Xmx512m)
                 final String opt = getLongPrefix(token);
-
                 if (opt != null && options.getOption(opt).acceptsArg()) {
                     handleOption(options.getOption(opt));
                     currentOption.processValue(stripLeadingAndTrailingQuotesDefaultOff(token.substring(opt.length())));
@@ -582,7 +568,6 @@ private void handleShortAndLongOption(final String hyphenToken) throws ParseExce
             // equal sign found (-xxx=yyy)
             final String opt = token.substring(0, pos);
             final String value = token.substring(pos + 1);
-
             if (opt.length() == 1) {
                 // -S=V
                 final Option option = options.getOption(opt);
@@ -635,9 +620,8 @@ private void handleToken(final String token) throws ParseException {
     }
 
     /**
-     * Handles an unknown token. If the token starts with a dash an UnrecognizedOptionException is thrown. Otherwise the
-     * token is added to the arguments of the command line. If the stopAtNonOption flag is set, this stops the parsing and
-     * the remaining tokens are added as-is in the arguments of the command line.
+     * Handles an unknown token. If the token starts with a dash an UnrecognizedOptionException is thrown. Otherwise the token is added to the arguments of the
+     * command line. If the stopAtNonOption flag is set, this stops the parsing and the remaining tokens are added as-is in the arguments of the command line.
      *
      * @param token The command line token to handle.
      * @throws ParseException if parsing should fail.
@@ -659,7 +643,7 @@ protected void handleUnknownToken(final String token) throws ParseException {
     /**
      * Tests if the token is a valid argument.
      *
-     * @param token
+     * @param token The command line token to test.
      */
     private boolean isArgument(final String token) {
         return !isOption(token) || isNegativeNumber(token);
@@ -667,6 +651,8 @@ private boolean isArgument(final String token) {
 
     /**
      * Tests if the specified token is a Java-like property (-Dkey=value).
+     *
+     * @param token The command line token to test.
      */
     private boolean isJavaProperty(final String token) {
         final String opt = token.isEmpty() ? null : token.substring(0, 1);
@@ -677,7 +663,7 @@ private boolean isJavaProperty(final String token) {
     /**
      * Tests if the token looks like a long option.
      *
-     * @param token
+     * @param token The command line token to test.
      */
     private boolean isLongOption(final String token) {
         if (token == null || !token.startsWith(OptionFormatter.DEFAULT_OPT_PREFIX) || token.length() == 1) {
@@ -699,7 +685,7 @@ private boolean isLongOption(final String token) {
     /**
      * Tests if the token is a negative number.
      *
-     * @param token
+     * @param token The command line token to test.
      */
     private boolean isNegativeNumber(final String token) {
         try {
@@ -713,7 +699,7 @@ private boolean isNegativeNumber(final String token) {
     /**
      * Tests if the token looks like an option.
      *
-     * @param token
+     * @param token The command line token to test.
      */
     private boolean isOption(final String token) {
         return isLongOption(token) || isShortOption(token);
@@ -722,7 +708,7 @@ private boolean isOption(final String token) {
     /**
      * Tests if the token looks like a short option.
      *
-     * @param token
+     * @param token The command line token to test.
      */
     private boolean isShortOption(final String token) {
         // short options (-S, -SV, -S=V, -SV1=V2, -S1S2)
@@ -742,11 +728,10 @@ private boolean isShortOption(final String token) {
     /**
      * Parses the arguments according to the specified options and properties.
      *
-     * @param options The specified Options
-     * @param properties command line option name-value pairs
+     * @param options         The specified Options.
+     * @param properties      command line option name-value pairs.
      * @param nonOptionAction see {@link NonOptionAction}.
-     * @param arguments The command line arguments
-     *
+     * @param arguments       The command line arguments.
      * @return The list of atomic option and value tokens.
      * @throws ParseException if there are any problems encountered while parsing the command line tokens.
      * @since 1.10.0
@@ -782,6 +767,14 @@ public CommandLine parse(final Options options, final String[] arguments) throws
     }
 
     /**
+     * Parses the arguments according to the specified options and properties.
+     *
+     * @param options         The specified Options.
+     * @param arguments       The command line arguments.
+     * @param stopAtNonOption if {@code true} an unrecognized argument stops the parsing and the remaining arguments are added to the {@link CommandLine}s args
+     *                        list. If {@code false} an unrecognized argument triggers a ParseException.
+     * @return The list of atomic option and value tokens.
+     * @throws ParseException if there are any problems encountered while parsing the command line tokens.
      * @see #parse(Options, Properties, NonOptionAction, String[])
      */
     @Override
@@ -792,8 +785,8 @@ public CommandLine parse(final Options options, final String[] arguments, final
     /**
      * Parses the arguments according to the specified options and properties.
      *
-     * @param options The specified Options.
-     * @param arguments The command line arguments.
+     * @param options    The specified Options.
+     * @param arguments  The command line arguments.
      * @param properties command line option name-value pairs.
      * @return The list of atomic option and value tokens.
      * @throws ParseException if there are any problems encountered while parsing the command line tokens.
@@ -805,24 +798,22 @@ public CommandLine parse(final Options options, final String[] arguments, final
     /**
      * Parses the arguments according to the specified options and properties.
      *
-     * @param options The specified Options.
-     * @param arguments The command line arguments.
-     * @param properties command line option name-value pairs.
-     * @param stopAtNonOption if {@code true} an unrecognized argument stops the parsing and the remaining arguments
-     *        are added to the {@link CommandLine}s args list. If {@code false} an unrecognized argument triggers a
-     *        ParseException.
+     * @param options         The specified Options.
+     * @param arguments       The command line arguments.
+     * @param properties      command line option name-value pairs.
+     * @param stopAtNonOption if {@code true} an unrecognized argument stops the parsing and the remaining arguments are added to the {@link CommandLine}s args
+     *                        list. If {@code false} an unrecognized argument triggers a ParseException.
      * @return The list of atomic option and value tokens.
      * @throws ParseException if there are any problems encountered while parsing the command line tokens.
      * @see #parse(Options, Properties, NonOptionAction, String[])
      */
     public CommandLine parse(final Options options, final String[] arguments, final Properties properties, final boolean stopAtNonOption)
-        throws ParseException {
+            throws ParseException {
         return parse(options, properties, stopAtNonOption ? NonOptionAction.STOP : NonOptionAction.THROW, arguments);
     }
 
     /**
-     * Strips balanced leading and trailing quotes if the stripLeadingAndTrailingQuotes is set
-     * If stripLeadingAndTrailingQuotes is null, then do not strip
+     * Strips balanced leading and trailing quotes if the stripLeadingAndTrailingQuotes is set If stripLeadingAndTrailingQuotes is null, then do not strip
      *
      * @param token A string.
      * @return token with the quotes stripped (if set).
@@ -835,8 +826,7 @@ private String stripLeadingAndTrailingQuotesDefaultOff(final String token) {
     }
 
     /**
-     * Strips balanced leading and trailing quotes if the stripLeadingAndTrailingQuotes is set
-     * If stripLeadingAndTrailingQuotes is null, then do not strip
+     * Strips balanced leading and trailing quotes if the stripLeadingAndTrailingQuotes is set If stripLeadingAndTrailingQuotes is null, then do not strip
      *
      * @param token A string.
      * @return token with the quotes stripped (if set).
@@ -851,7 +841,7 @@ private String stripLeadingAndTrailingQuotesDefaultOn(final String token) {
     /**
      * Removes the option or its group from the list of expected elements.
      *
-     * @param option
+     * @param option The option to remove from the list of expected elements.
      */
     private void updateRequiredOptions(final Option option) throws AlreadySelectedException {
         if (option.isRequired()) {

From de0bd57bd92b261152af254907f1d129869a6acf Mon Sep 17 00:00:00 2001
From: Naveed Khan <164054284+rootvector2@users.noreply.github.com>
Date: Wed, 12 Aug 2026 15:43:24 +0000
Subject: [PATCH 157/163] Reject UTF-16 surrogate values in Character converter
 (#438)

---
 src/main/java/org/apache/commons/cli/TypeHandler.java     | 3 +++
 src/test/java/org/apache/commons/cli/TypeHandlerTest.java | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java b/src/main/java/org/apache/commons/cli/TypeHandler.java
index d889dfcf7..4709c7811 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -236,6 +236,9 @@ public static FileInputStream openFile(final String string) throws ParseExceptio
                 if (!Character.isBmpCodePoint(codePoint)) {
                     throw new IllegalArgumentException("Code point U+" + Integer.toHexString(codePoint) + " does not fit in a char");
                 }
+                if (Character.isSurrogate((char) codePoint)) {
+                    throw new IllegalArgumentException("Code point U+" + Integer.toHexString(codePoint) + " is a UTF-16 surrogate");
+                }
                 return (char) codePoint;
             }
             return s.charAt(0);
diff --git a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
index 8b6b21820..fe14877ac 100644
--- a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
+++ b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
@@ -135,6 +135,8 @@ private static Stream createValueTestParameters() throws MalformedURL
         list.add(Arguments.of("5.5", Character.class, '5'));
         list.add(Arguments.of("\\u0124", Character.class, Character.toChars(0x0124)[0]));
         list.add(Arguments.of("\\u1F600", Character.class, ParseException.class));
+        list.add(Arguments.of("\\uD800", Character.class, ParseException.class));
+        list.add(Arguments.of("\\uDFFF", Character.class, ParseException.class));
 
         list.add(Arguments.of("just-a-string", Double.class, ParseException.class));
         list.add(Arguments.of("5", Double.class, 5d));

From 1aaa321944c398da78b30c8e42e10a299a131f64 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Wed, 12 Aug 2026 11:45:27 -0400
Subject: [PATCH 158/163] Reject UTF-16 surrogate values in Character converter
 (#438).

---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0f31bf9e6..3da9591af 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -34,6 +34,7 @@
       Reject an empty option name in getMatchingOptions (#434).
       Reject trailing text after the date in Converter.DATE (#435).
       Fix integer overflow in TextHelpAppendable.indexOfWrap (#437).
+      Reject UTF-16 surrogate values in Character converter (#438).
       
       Add AbstractHelpFormatter.printHelp(String, Options).
       

From edb471ff372447b73ecee8d0cb1a29b9269ed046 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Tue, 18 Aug 2026 15:51:49 -0400
Subject: [PATCH 159/163] Bump codeql-action from 4.37.6 to 4.37.7

---
 .github/workflows/codeql-analysis.yml     | 6 +++---
 .github/workflows/scorecards-analysis.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 38e64244a..e81db39f8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -58,7 +58,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
+      uses: github//init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # 4.37.7
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -69,7 +69,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
+      uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # 4.37.7
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -83,4 +83,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
+      uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # 4.37.7
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index 7c2b151b4..b5289bff0 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -64,6 +64,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # 4.37.6
+        uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # 4.37.7
         with:
           sarif_file: results.sarif

From 32ac5ba8fe403e6a53d39385b65601e625480868 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Tue, 18 Aug 2026 15:55:21 -0400
Subject: [PATCH 160/163] Bump codeql-action from 4.37.6 to 4.37.7

---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e81db39f8..d0c44b99c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -58,7 +58,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github//init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # 4.37.7
+      uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # 4.37.7
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.

From 105ca3fb1ef861ee8cde870f3fb551895caaa892 Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 22 Aug 2026 07:58:49 -0400
Subject: [PATCH 161/163] Bump org.apache.commons:commons-parent from 103 to
 104.

---
 pom.xml                 | 2 +-
 src/changes/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1138f6544..760a67205 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   
     org.apache.commons
     commons-parent
-    103
+    104
   
   4.0.0
   commons-cli
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3da9591af..d4a5b0540 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -38,7 +38,7 @@
       
       Add AbstractHelpFormatter.printHelp(String, Options).
       
-      Bump org.apache.commons:commons-parent from 91 to 103 #414, #416.
+      Bump org.apache.commons:commons-parent from 91 to 104 #414, #416.
       [test] Bump org.apache.commons:commons-text from 1.14.0 to 1.15.0.
       Bump commons-io:commons-io from 2.21.0 to 2.22.0.
     

From 0f561e5979d1f10b93ae98ef1fcd908ec33c048e Mon Sep 17 00:00:00 2001
From: dev_Hakaze 
Date: Sat, 22 Aug 2026 21:18:51 +0700
Subject: [PATCH 162/163] [CLI-354] Fix HelpFormatter wrapped description
 indent (#439)

When remaining pad equals indent, continuation lines dropped the leading
indent and padded the right instead, so some wrapped description lines sat
one space left of the others. Apply indent when restLen >= indent.

Co-authored-by: arimu1 <19286898+arimu1@users.noreply.github.com>
---
 .../apache/commons/cli/help/TextStyle.java    |  2 +-
 .../commons/cli/help/HelpFormatterTest.java   | 33 +++++++++++++++++++
 .../commons/cli/help/TextStyleTest.java       | 11 +++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/cli/help/TextStyle.java b/src/main/java/org/apache/commons/cli/help/TextStyle.java
index fef720f34..02346daae 100644
--- a/src/main/java/org/apache/commons/cli/help/TextStyle.java
+++ b/src/main/java/org/apache/commons/cli/help/TextStyle.java
@@ -369,7 +369,7 @@ public CharSequence pad(final boolean addIndent, final CharSequence text) {
                 rest = "";
             } else {
                 int restLen = maxWidth - text.length();
-                if (addIndent && restLen > indent) {
+                if (addIndent && restLen >= indent) {
                     indentPad = Util.repeatSpace(indent);
                     restLen -= indent;
                 } else {
diff --git a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
index 04041f644..e7b995bca 100644
--- a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -340,6 +340,39 @@ void testPrintOptions() throws IOException {
         assertEquals(expected, actual);
     }
 
+    /**
+     * Continuation description lines must share the same indent.
+     *
+     * @see [CLI-354] HelpFormatter: Description indentation is incorrect
+     */
+    @Test
+    void testPrintHelpWrappedDescriptionIndent() throws IOException {
+        final StringBuilder sb = new StringBuilder();
+        final TextHelpAppendable serializer = new TextHelpAppendable(sb);
+        final HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).setShowSince(false).get();
+        final String description = "an argument passed to the remote command. The value will be wrapped in double quotes "
+                + "and appended to the command-line. This option can be added multiple times.";
+        final Options options = new Options().addOption(Option.builder("V").longOpt("argument-value").hasArg().desc(description).get());
+
+        final List expected = new ArrayList<>();
+        expected.add(" usage:  cs [-V ]");
+        expected.add("");
+        expected.add(" header");
+        expected.add("");
+        expected.add("          Options                               Description                ");
+        expected.add(" -V, --argument-value      an argument passed to the remote command.  ");
+        expected.add("                                 The value will be wrapped in double quotes");
+        expected.add("                                 and appended to the command-line. This    ");
+        expected.add("                                 option can be added multiple times.       ");
+        expected.add("");
+        expected.add(" footer");
+        expected.add("");
+
+        formatter.printHelp("cs", "header", options, "footer", true);
+        final List actual = IOUtils.readLines(new StringReader(sb.toString()));
+        assertEquals(expected, actual);
+    }
+
     @Test
     void testSetOptionFormatBuilderTest() {
         final HelpFormatter.Builder underTest = HelpFormatter.builder();
diff --git a/src/test/java/org/apache/commons/cli/help/TextStyleTest.java b/src/test/java/org/apache/commons/cli/help/TextStyleTest.java
index b3e946278..2f18ae3ba 100644
--- a/src/test/java/org/apache/commons/cli/help/TextStyleTest.java
+++ b/src/test/java/org/apache/commons/cli/help/TextStyleTest.java
@@ -71,6 +71,17 @@ static Stream padTestData() {
         builder.setAlignment(TextStyle.Alignment.CENTER);
         lst.add(Arguments.of(builder.get(), "    Hello world     ", "    Hello world     "));
 
+        // width equal to text length + indent applies indent on continuation lines
+        builder.setMaxWidth(16);
+        builder.setAlignment(TextStyle.Alignment.LEFT);
+        lst.add(Arguments.of(builder.get(), "Hello world     ", "     Hello world"));
+
+        builder.setAlignment(TextStyle.Alignment.RIGHT);
+        lst.add(Arguments.of(builder.get(), "     Hello world", "     Hello world"));
+
+        builder.setAlignment(TextStyle.Alignment.CENTER);
+        lst.add(Arguments.of(builder.get(), "  Hello world   ", "  Hello world   "));
+
         // width greater than text length and less than text length + indent creates result of text length + pad
         builder.setMaxWidth(14);
         builder.setAlignment(TextStyle.Alignment.LEFT);

From 0a68ae0e826bb08eb59bda9bae7ec5d84008b62a Mon Sep 17 00:00:00 2001
From: Gary Gregory 
Date: Sat, 22 Aug 2026 10:20:21 -0400
Subject: [PATCH 163/163] [CLI-354] Fix HelpFormatter wrapped description
 indent (#439).

---
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d4a5b0540..0bc73da08 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -35,6 +35,7 @@
       Reject trailing text after the date in Converter.DATE (#435).
       Fix integer overflow in TextHelpAppendable.indexOfWrap (#437).
       Reject UTF-16 surrogate values in Character converter (#438).
+      Fix HelpFormatter wrapped description indent (#439).
       
       Add AbstractHelpFormatter.printHelp(String, Options).
       

         Option Properties

1. Introducing Apache Commons CLI

Defining the CLI

Parsing the CLI

Using a boolean option

Creating the Options

Parsing the command line arguments

Defining Argument Options

Defining Java Property Option

Defining Java Property Option

Defining Java Property Option

Creating the Options

Creating the Options

Creating the Parser

Displaying Usage and Help

Options for this example. + Options for this example.

`// create the command line parser CommandLineParser parser = new DefaultParser(); @@ -468,7 +468,7 @@`
`+ .get();`

Changing Usage Announcement

Changing help format

7. Defining Option Properties

Parsing the command line arguments

Parsing the command line arguments

Retrieving the argument value

1. Introducing Apache Commons CLI

Defining the CLI

Parsing the CLI

Using a boolean option

Creating the Options

Parsing the command line arguments

Defining Argument Options

Defining Java Property Option

Defining Java Property Option

Defining Java Property Option

Creating the Options

Creating the Options

Creating the Parser

Displaying Usage and Help

Options for this example. + Options for this example. // create the command line parser CommandLineParser parser = new DefaultParser(); @@ -468,7 +468,7 @@ + .get();

Changing Usage Announcement

Changing help format

7. Defining Option Properties

Parsing the command line arguments

Parsing the command line arguments

Retrieving the argument value

Options for this example. + Options for this example.

`// create the command line parser CommandLineParser parser = new DefaultParser(); @@ -468,7 +468,7 @@`
`+ .get();`