[groovy] branch master updated: GROOVY-10331: Bump Commons CLI to 1.5.0

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new f28afbc  GROOVY-10331: Bump Commons CLI to 1.5.0
f28afbc is described below

commit f28afbc38e5abbb6f96b856a59c0fb3de98d6f51
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Oct 28 11:06:43 2021 +1000

    GROOVY-10331: Bump Commons CLI to 1.5.0
---
 gradle/verification-metadata.xml                                     | 5 +++++
 .../src/main/groovy/groovy/cli/commons/CliBuilder.groovy             | 4 ++--
 .../src/main/groovy/groovy/cli/commons/OptionAccessor.groovy         | 2 +-
 versions.properties                                                  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 95ba292..bd23879 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -463,6 +463,11 @@
             <pgp value="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0"/>
          </artifact>
       </component>
+      <component group="commons-cli" name="commons-cli" version="1.5.0">
+         <artifact name="commons-cli-1.5.0.jar">
+            <pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>
+         </artifact>
+      </component>
       <component group="commons-codec" name="commons-codec" version="1.13">
          <artifact name="commons-codec-1.13.jar">
             <pgp value="2db4f1ef0fa761ecc4ea935c86fdc7e2a11262cb"/>
diff --git 
a/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/CliBuilder.groovy
 
b/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/CliBuilder.groovy
index 15d6632..864b0aa 100644
--- 
a/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/CliBuilder.groovy
+++ 
b/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/CliBuilder.groovy
@@ -552,8 +552,8 @@ class CliBuilder {
         if (conv && conv instanceof Class) {
             savedTypeOptions[name].convert = conv.newInstance(t, t)
         }
-        boolean hasArg = savedTypeOptions[name]?.cliOption?.numberOfArgs == 1
-        boolean noArg = savedTypeOptions[name]?.cliOption?.numberOfArgs == 0
+        boolean hasArg = savedTypeOptions[name]?.cliOption?.args == 1
+        boolean noArg = savedTypeOptions[name]?.cliOption?.args == 0
         if (namesAreSetters) {
             def isBoolArg = m.parameterTypes.size() > 0 && 
m.parameterTypes[0].simpleName.toLowerCase() == 'boolean'
             boolean isFlag = (isBoolArg && !hasArg) || noArg
diff --git 
a/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/OptionAccessor.groovy
 
b/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/OptionAccessor.groovy
index 8e0b7b3..f2dd92c 100644
--- 
a/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/OptionAccessor.groovy
+++ 
b/subprojects/groovy-cli-commons/src/main/groovy/groovy/cli/commons/OptionAccessor.groovy
@@ -98,7 +98,7 @@ class OptionAccessor {
     }
 
     private <T> T getTypedValue(Class<T> type, String optionName, String 
optionValue) {
-        if (savedTypeOptions[optionName]?.cliOption?.numberOfArgs == 0) {
+        if (savedTypeOptions[optionName]?.cliOption?.args == 0) {
             return (T) commandLine.hasOption(optionName)
         }
         def convert = savedTypeOptions[optionName]?.convert
diff --git a/versions.properties b/versions.properties
index 79151bf..d2580f4 100644
--- a/versions.properties
+++ b/versions.properties
@@ -23,7 +23,7 @@ antlr4=4.9.0
 bridger=1.5.Final
 codenarc=2.2.0
 cobertura=1.9.4.1
-commonsCli=1.4
+commonsCli=1.5.0
 commonsMath3=3.6.1
 gpars=1.2.1
 ivy=2.5.0