rpm/apache-commons-cli
SHA256
1
0
Fork 0
forked from pool/apache-commons-cli
Code Pull Requests Activity

Accepting request 1193659 from Java:packages

Browse Source 
1.8.0

OBS-URL: https://build.opensuse.org/request/show/1193659
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-cli?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2024-08-14 12:14:45 +00:00 committed by Git OBS Bridge
commit 98b938722b
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CLI-253-workaround.patch
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
Index: commons-cli-1.7.0-src/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
--- a/src/main/java/org/apache/commons/cli/Options.java
+++ b/src/main/java/org/apache/commons/cli/Options.java
@@ -195,6 +195,20 @@ public class Options implements Serializ
return this;
}
@ -31,23 +29,19 @@ 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.
*
Index: commons-cli-1.7.0-src/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
+++ 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) {
throw new AmbiguousOptionException(opt, matchingOpts);
} else {
- currentOption = options.getOption(matchingOpts.get(0));
+ currentOption = options.getLongOption(matchingOpts.get(0));
--- a/src/main/java/org/apache/commons/cli/PosixParser.java
+++ b/src/main/java/org/apache/commons/cli/PosixParser.java
@@ -141,7 +141,7 @@ public class PosixParser extends Parser
} else if (matchingOpts.size() > 1) {
throw new AmbiguousOptionException(opt, matchingOpts);
} else {
- currentOption = options.getOption(matchingOpts.get(0));
+ currentOption = options.getLongOption(matchingOpts.get(0));
tokens.add("--" + currentOption.getLongOpt());
if (pos != -1) {
Index: commons-cli-1.7.0-src/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
===================================================================
tokens.add("--" + currentOption.getLongOpt());
if (pos != -1) {
--- /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 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more

2
apache-commons-cli-build.xml
View File

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

7
apache-commons-cli.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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>

2
apache-commons-cli.spec
View File

@ -19,7 +19,7 @@
%global base_name cli
%global short_name commons-%{base_name}
Name: apache-commons-cli
Version: 1.7.0
Version: 1.8.0
Release: 0
Summary: Command Line Interface Library for Java
License: Apache-2.0

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

Binary file not shown.

3
commons-cli-1.8.0-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ff484c5b318df2d451c0f746a44f4839cedc953f4d4143c04176a3436e0a1ba
size 180524