[groovy] branch GROOVY_2_5_X updated: GROOVY-9202 Bump picocli to 4.0.1

[rp...@apache.org]

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

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


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
     new 5c80e0d  GROOVY-9202 Bump picocli to 4.0.1
5c80e0d is described below

commit 5c80e0da109b88182d9d960ce40b51869ffcce20
Author: Remko Popma <re...@yahoo.com>
AuthorDate: Tue Jul 23 09:15:06 2019 +0900

    GROOVY-9202 Bump picocli to 4.0.1
    
    (cherry picked from commit 669127c94559f0c54d1bb548c790813b33ece417)
---
 build.gradle                                                        | 2 +-
 .../groovy-cli-picocli/src/spec/test/builder/CliBuilderTest.groovy  | 2 +-
 .../src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 852c566..0e00b60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ ext {
     log4jVersion = '1.2.17'
     log4j2Version = '2.8'
     openbeansVersion = '1.0'
-    picocliVersion = '3.9.5'
+    picocliVersion = '4.0.1'
     qdoxVersion = '1.12.1'
     slf4jVersion = '1.7.25'
     xmlunitVersion = '1.6'
diff --git a/subprojects/groovy-cli-picocli/src/spec/test/builder/CliBuilderTest.groovy b/subprojects/groovy-cli-picocli/src/spec/test/builder/CliBuilderTest.groovy
index 28de592..321ad7b 100644
--- a/subprojects/groovy-cli-picocli/src/spec/test/builder/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-picocli/src/spec/test/builder/CliBuilderTest.groovy
@@ -188,7 +188,7 @@ Options:
         cli.usage()
 
         String expected = '''\
-Usage: curl [-Gq] [--basic] [--url=<URL>] [-d=<data>]
+Usage: curl [-Gq] [--basic] [-d=<data>] [--url=<URL>]
       --basic         Use HTTP Basic Authentication
   -d, --data=<data>   HTTP POST data
   -G, --get           Send the -d data with a HTTP GET
diff --git a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
index 526f6cf..9a0273d 100644
--- a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
@@ -71,8 +71,8 @@ class CliBuilderTest extends GroovyTestCase {
         def expectedUsage = """Usage: $usageString
   -c, --encoding=<charset>   character encoding
   -h, --help                 usage information
-  -i=[<extension>]           modify files in place, create backup if extension is
-                               specified (e.g. '.bak')"""
+  -i=[<extension>]           modify files in place, create backup if extension
+                               is specified (e.g. '.bak')"""
         assertEquals(expectedUsage, stringWriter.toString().tokenize('\r\n').join('\n'))
         resetPrintWriter()
         cli.writer = printWriter
@@ -160,7 +160,7 @@ class CliBuilderTest extends GroovyTestCase {
         cli.parse([])
         // NB: This test is very fragile and is bound to fail on different locales and versions of commons-cli... :-(
         assert stringWriter.toString() == String.format(
-                "error: Missing required option '-x=PARAM'%n" +\
+                "error: Missing required option '-x'%n" +\
                 "Usage: groovy -x%n" +\
                 "  -x           message%n")
     }