17
0

5 Commits

6 changed files with 97 additions and 25 deletions

View File

@@ -6,10 +6,8 @@ CommitDate: Mon Jun 22 15:04:05 2015 +0200
[CLI-253] Prevent "Unrecognized option: --null" when handling long opts in PosixParser [CLI-253] Prevent "Unrecognized option: --null" when handling long opts in PosixParser
Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java --- a/src/main/java/org/apache/commons/cli/Options.java
=================================================================== +++ b/src/main/java/org/apache/commons/cli/Options.java
--- commons-cli-1.7.0-src.orig/src/main/java/org/apache/commons/cli/Options.java
+++ commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java
@@ -195,6 +195,20 @@ public class Options implements Serializ @@ -195,6 +195,20 @@ public class Options implements Serializ
return this; return this;
} }
@@ -31,11 +29,9 @@ Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/Options.java
/** /**
* Gets the options with a long name starting with the name specified. * Gets the options with a long name starting with the name specified.
* *
Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.java --- a/src/main/java/org/apache/commons/cli/PosixParser.java
=================================================================== +++ b/src/main/java/org/apache/commons/cli/PosixParser.java
--- commons-cli-1.7.0-src.orig/src/main/java/org/apache/commons/cli/PosixParser.java @@ -141,7 +141,7 @@ public class PosixParser extends Parser
+++ commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.java
@@ -145,7 +145,7 @@ public class PosixParser extends Parser
} else if (matchingOpts.size() > 1) { } else if (matchingOpts.size() > 1) {
throw new AmbiguousOptionException(opt, matchingOpts); throw new AmbiguousOptionException(opt, matchingOpts);
} else { } else {
@@ -44,10 +40,8 @@ Index: commons-cli-1.7.0-src/src/main/java/org/apache/commons/cli/PosixParser.ja
tokens.add("--" + currentOption.getLongOpt()); tokens.add("--" + currentOption.getLongOpt());
if (pos != -1) { if (pos != -1) {
Index: commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
===================================================================
--- /dev/null --- /dev/null
+++ commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java +++ b/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+/* +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more + * Licensed to the Apache Software Foundation (ASF) under one or more

View File

@@ -8,7 +8,7 @@
<property name="project.artifactId" value="commons-cli"/> <property name="project.artifactId" value="commons-cli"/>
<property name="project.groupId" value="commons-cli"/> <property name="project.groupId" value="commons-cli"/>
<property name="project.version" value="1.7.0"/> <property name="project.version" value="1.10.0"/>
<property name="compiler.release" value="8"/> <property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.source" value="1.${compiler.release}"/>

View File

@@ -1,3 +1,81 @@
-------------------------------------------------------------------
Wed Nov 5 07:25:32 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Update to 1.10.0
* New Features
+ CLI-339: Help formatter extension in the new package #314.
+ CommandLine.Builder implements Supplier<CommandLine>.
+ DefaultParser.Builder implements Supplier<DefaultParser>.
+ CLI-340: Add CommandLine.getParsedOptionValues() #334.
+ CLI-333: org.apache.commons.cli.Option.Builder implements
Supplier<Option>.
* Fixed Bugs
+ Deprecate CommandLine.Builder() in favor of
CommandLine.builder().
+ Deprecate DeprecatedAttributes.Builder() in favor of
DeprecatedAttributes.builder().
+ Refactor default parser test #294.
+ Port to JUnit 5.
+ Generics for Converter should use Exception not Throwable.
+ Pick up maven-antrun-plugin version from parent POM
org.apache:apache.
+ Javadoc is missing its Overview page.
+ Get mockito version from parent pom (#351).
+ Remove -nouses directive from maven-bundle-plugin. OSGi
package imports now state 'uses' definitions for package
imports, this doesn't affect JPMS
(from org.apache.commons:commons-parent:80).
+ Deprecate PatternOptionBuilder.PatternOptionBuilder().
+ CLI-341: HelpFormatter infinite loop with 0 width input.
+ CLI-349: Fail faster with a more precise NullPointerException:
Option.processValue() throws NullPointerException when passed
null value with value separator configured.
+ CLI-344: Fail faster with a more precise NullPointerException:
DefaultParser.parse() throws NullPointerException when options
parameter is null.
+ CLI-347: Options.addOptionGroup(OptionGroup) does not remove
required options from requiredOpts list.
+ org.apache.commons.cli.Option.Builder.get() should throw
IllegalStateException instead of IllegalArgumentException.
+ org.apache.commons.cli.Option.processValue(String) should
throw IllegalStateException instead of
IllegalArgumentException.
+ org.apache.commons.cli.OptionBuilder.create() should throw
IllegalStateException instead of IllegalArgumentException.
* Updates
+ Bump org.apache.commons:commons-parent from 72 to 85 #302,
#304, #310, #315, #320, #327, #371.
+ [test] Bump commons-io:commons-io from 2.16.1 to 2.20.0 #309,
#337.
+ [test] Bump org.apache.commons:commons-text from 1.12.0 to
1.14.0 #344.
+ Update site documentation to
https://maven.apache.org/xsd/xdoc-2.0.xsd.
-------------------------------------------------------------------
Thu Nov 7 09:47:59 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Update to 1.9.0
* New features
+ Add OptionGroup.isSelected().
+ You can now extend HelpFormatter.Builder.
+ Add 'since' attribute to Option to track when an Option was
introduced #292
* Fixed bugs
+ CLI-334: Fix Javadoc pathing #280.
+ CLI-335: Updated properties documentation #285.
+ CLI-336: Deprecation not always reported #284.
+ Replace internal StringBuffer with StringBuilder.
* Updates
+ Bump org.apache.commons:commons-parent from 70 to 72 #283.
-------------------------------------------------------------------
Mon Aug 12 12:14:19 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Update to 1.8.0
* Fix Javadoc pathing #280. Fixes CLI-334.
- Revised CLI-253-workaround.patch for compatibility with 1.8.0
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 29 11:36:14 UTC 2024 - Gus Kenion <gus.kenion@suse.com> Mon Apr 29 11:36:14 UTC 2024 - Gus Kenion <gus.kenion@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-cli # spec file for package apache-commons-cli
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global base_name cli %global base_name cli
%global short_name commons-%{base_name} %global short_name commons-%{base_name}
Name: apache-commons-cli Name: apache-commons-cli
Version: 1.7.0 Version: 1.10.0
Release: 0 Release: 0
Summary: Command Line Interface Library for Java Summary: Command Line Interface Library for Java
License: Apache-2.0 License: Apache-2.0

BIN
commons-cli-1.10.0-src.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
commons-cli-1.7.0-src.tar.gz (Stored with Git LFS)

Binary file not shown.