From b85deacf20f310ff2c89a619d8b8c83614ce4dfc Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Jun 23 2015 12:06:24 +0000
Subject: Add workaround for CLI-253


---

diff --git a/CLI-253-workaround.patch b/CLI-253-workaround.patch
new file mode 100644
index 0000000..798c5a4
--- /dev/null
+++ b/CLI-253-workaround.patch
@@ -0,0 +1,96 @@
+commit 77218790904f40395304669f5d79740f459c0a90 (HEAD -> cli-253, origin/cli-253)
+Author:     Michal Srb <msrb@redhat.com>
+AuthorDate: Mon Jun 22 15:01:30 2015 +0200
+Commit:     Michal Srb <msrb@redhat.com>
+CommitDate: Mon Jun 22 15:04:05 2015 +0200
+
+    [CLI-253] Prevent "Unrecognized option: --null" when handling long opts in PosixParser
+
+diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
+index 0ee4eea..1c38194 100644
+--- a/src/main/java/org/apache/commons/cli/Options.java
++++ b/src/main/java/org/apache/commons/cli/Options.java
+@@ -224,6 +224,20 @@ public class Options implements Serializable
+     }
+ 
+     /**
++     * Retrieve the {@link Option} matching the long name specified.
++     * The leading hyphens in the name are ignored (up to 2).
++     *
++     * @param opt long name of the {@link Option}
++     * @return the option represented by opt
++     */
++    Option getLongOption(String opt)
++    {
++        opt = Util.stripLeadingHyphens(opt);
++
++        return longOpts.get(opt);
++    }
++
++    /**
+      * Returns the options with a long name starting with the name specified.
+      * 
+      * @param opt the partial name of the option
+diff --git a/src/main/java/org/apache/commons/cli/PosixParser.java b/src/main/java/org/apache/commons/cli/PosixParser.java
+index c13a65e..14d2936 100644
+--- a/src/main/java/org/apache/commons/cli/PosixParser.java
++++ b/src/main/java/org/apache/commons/cli/PosixParser.java
+@@ -131,7 +131,7 @@ public class PosixParser extends Parser
+                 }
+                 else
+                 {
+-                    currentOption = options.getOption(matchingOpts.get(0));
++                    currentOption = options.getLongOption(matchingOpts.get(0));
+                     
+                     tokens.add("--" + currentOption.getLongOpt());
+                     if (pos != -1)
+diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java
+new file mode 100644
+index 0000000..e37b7bc
+--- /dev/null
++++ 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
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ *      http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++package org.apache.commons.cli.bug;
++
++import static org.junit.Assert.assertTrue;
++
++import org.apache.commons.cli.CommandLine;
++import org.apache.commons.cli.Option;
++import org.apache.commons.cli.Options;
++import org.apache.commons.cli.ParseException;
++import org.apache.commons.cli.PosixParser;
++import org.junit.Test;
++
++@SuppressWarnings("deprecation") // tests some deprecated classes
++public class BugCLI253Test {
++
++    @Test
++    public void testGroovyUseCase() throws ParseException {
++        CommandLine cli = new PosixParser().parse(getOptions(), new String[] { "--classpath" });
++        assertTrue(cli.hasOption("--classpath"));
++    }
++
++    private Options getOptions() {
++        Options options = new Options();
++        options.addOption(Option.builder("classpath").build());
++        options.addOption(Option.builder("cp").longOpt("classpath").build());
++        return options;
++    }
++}
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index ac2a9fd..6ec79ec 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -2,12 +2,14 @@
 
 Name:             apache-%{short_name}
 Version:          1.3.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Command Line Interface Library for Java
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://commons.apache.org/cli/
 Source0:          http://www.apache.org/dist/commons/cli/source/%{short_name}-%{version}-src.tar.gz
+# workaround for https://issues.apache.org/jira/browse/CLI-253
+Patch0:           CLI-253-workaround.patch
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -33,6 +35,8 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
+%patch0 -p1
+
 # Compatibility links
 %mvn_alias "%{short_name}:%{short_name}" "org.apache.commons:%{short_name}"
 %mvn_file :commons-cli %{short_name} %{name}
@@ -50,6 +54,9 @@ This package contains the API documentation for %{name}.
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Jun 23 2015 Michal Srb <msrb@redhat.com> - 1.3.1-2
+- Add workaround for CLI-253
+
 * Wed Jun 17 2015 Michal Srb <msrb@redhat.com> - 1.3.1-1
 - Update to upstream version 1.3.1