accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch master updated: ACCUMULO-4703 Upgrade JCommander to 1.72
Date Thu, 28 Sep 2017 21:01:30 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 44a1f4d  ACCUMULO-4703 Upgrade JCommander to 1.72
44a1f4d is described below

commit 44a1f4d07bd4a8eb12a265b9de540311e485ee35
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Thu Sep 28 16:42:13 2017 -0400

    ACCUMULO-4703 Upgrade JCommander to 1.72
---
 pom.xml                                                            | 2 +-
 shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8714c2f..dc34665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
       <dependency>
         <groupId>com.beust</groupId>
         <artifactId>jcommander</artifactId>
-        <version>1.60</version>
+        <version>1.72</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
index d948768..ee3935c 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
@@ -94,7 +94,9 @@ public class ShellConfigTest {
   @Test
   public void testBadArg() throws IOException {
     assertFalse(shell.config(args("--bogus")));
-    assertTrue("Did not print usage", output.get().startsWith("Usage"));
+    // JCommander versions after 1.60 will cause the Shell to detect the arg as Unrecognized
option
+    assertTrue("Did not print Error", output.get().startsWith("ERROR"));
+    assertTrue("Did not print usage", output.get().contains("Usage"));
   }
 
   @Test

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

Mime
View raw message