From b63c2b8b89539587e22b70149b3b73243a29b3a6 Mon Sep 17 00:00:00 2001
From: Kengo Seki <sekikn@apache.org>
Date: Sat, 15 Jul 2023 10:25:03 +0900
Subject: [PATCH] PARQUET-2326: Bump jcommander from 1.72 to 1.82

---
 .../src/main/java/org/apache/parquet/cli/Help.java        | 8 ++++++--
 pom.xml                                                   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java b/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java
index 0cb534e122..dfa1f4a77a 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/Help.java
@@ -18,6 +18,8 @@
  */
 package org.apache.parquet.cli;
 
+import com.beust.jcommander.DefaultUsageFormatter;
+import com.beust.jcommander.IUsageFormatter;
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterDescription;
@@ -33,11 +35,13 @@ public class Help implements Command {
 
   private final JCommander jc;
   private final Logger console;
+  private final IUsageFormatter formatter;
   private String programName;
 
   public Help(JCommander jc, Logger console) {
     this.jc = jc;
     this.console = console;
+    this.formatter = new DefaultUsageFormatter(jc);
   }
 
   public void setProgramName(String programName) {
@@ -67,7 +71,7 @@ public int run() {
             new Object[] { programName, cmd });
         }
         console.info("\n  Description:");
-        console.info("\n    {}", jc.getCommandDescription(cmd));
+        console.info("\n    {}", formatter.getCommandDescription(cmd));
         if (!commander.getParameters().isEmpty()) {
           console.info("\n  Command options:\n");
           for (ParameterDescription param : commander.getParameters()) {
@@ -112,7 +116,7 @@ public void printGenericHelp() {
     console.info("\n  Commands:\n");
     for (String command : jc.getCommands().keySet()) {
       console.info("    {}\n\t{}",
-          command, jc.getCommandDescription(command));
+          command, formatter.getCommandDescription(command));
     }
 
     jc.getCommands().keySet().stream().filter(s -> !s.equals("help")).findFirst().ifPresent(command -> {
diff --git a/pom.xml b/pom.xml
index e48022a412..ea8cd4c873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
 
     <!-- parquet-cli dependencies -->
     <opencsv.version>2.3</opencsv.version>
-    <jcommander.version>1.72</jcommander.version>
+    <jcommander.version>1.82</jcommander.version>
     <zstd-jni.version>1.5.0-1</zstd-jni.version>
     <commons-text.version>1.8</commons-text.version>
     <jsr305.version>3.0.2</jsr305.version>