(orc) branch branch-2.0 updated: ORC-1698: Upgrade `commons-cli` to 1.7.0

[dongjoon]

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

dongjoon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new df38e5471 ORC-1698: Upgrade `commons-cli` to 1.7.0
df38e5471 is described below

commit df38e54711401d3c3a5e327db2bad0bb74b6afd5
Author: sychen <syc...@ctrip.com>
AuthorDate: Wed Apr 24 08:47:14 2024 -0700

    ORC-1698: Upgrade `commons-cli` to 1.7.0
    
    ### What changes were proposed in this pull request?
    This PR aims to upgrade `commons-cli` to 1.7.0.
    
    ### Why are the changes needed?
    Release 1.7.0 – 2024-04-13
    
    https://commons.apache.org/proper/commons-cli/changes-report.html#a1.7.0
    
    The default value of `getOptionValue` is null. After upgrading to 1.7.0, a 
new method was introduced, causing compilation to fail.
    
    ```java
    this.bloomFilterColumns = opts.getOptionValue('b', null);
    ```
    
    ```
    Error:  Failed to execute goal 
org.apache.maven.plugins:maven-compiler-plugin:3.10.1:compile (default-compile) 
on project orc-tools: Compilation failure
    Error:  
/root/orc/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java:[202,35]
 reference to getOptionValue is ambiguous
    Error:    both method getOptionValue(char,java.lang.String) in 
org.apache.commons.cli.CommandLine and method 
getOptionValue(char,java.util.function.Supplier<java.lang.String>) in 
org.apache.commons.cli.CommandLine match
    ```
    
    ### How was this patch tested?
    GA
    
    ### Was this patch authored or co-authored using generative AI tooling?
    No
    
    Closes #1906
    
    Closes #1907 from cxzl25/ORC-1698.
    
    Authored-by: sychen <syc...@ctrip.com>
    Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
    (cherry picked from commit 67b24baf3d044d743c8a0368be99d639e4487da0)
    Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
 java/bench/pom.xml                                                | 2 +-
 java/pom.xml                                                      | 2 +-
 java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index 42751b87e..a59127a6b 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
       </dependency>
       <dependency>
         <groupId>io.airlift</groupId>
diff --git a/java/pom.xml b/java/pom.xml
index be48629ae..e45db89d0 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -144,7 +144,7 @@
       <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
diff --git a/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java 
b/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
index fbdb8696d..f7e9bb105 100644
--- a/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
+++ b/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
@@ -199,7 +199,7 @@ public class ConvertTool {
     this.csvHeaderLines = getIntOption(opts, 'H', 0);
     this.csvNullString = opts.getOptionValue('n', "");
     this.timestampFormat = opts.getOptionValue("t", DEFAULT_TIMESTAMP_FORMAT);
-    this.bloomFilterColumns = opts.getOptionValue('b', null);
+    this.bloomFilterColumns = opts.getOptionValue('b');
     this.unionTag = opts.getOptionValue("union-tag", "tag");
     this.unionValue = opts.getOptionValue("union-value", "value");
     String outFilename = opts.hasOption('o')