From 9ae01bdbe839e77a30037b7563ac9d6fa5a76d14 Mon Sep 17 00:00:00 2001
From: yanmin <myanstu@163.com>
Date: Tue, 5 Nov 2024 10:39:49 +0800
Subject: [PATCH] HADOOP-19143. Upgrade commons-cli to 1.9.0 (#7126)
 Contributed by Min Yan.

Reviewed-by: Ayush Saxena <ayushsaxena@apache.org>
Signed-off-by: Shilun Fan <slfan1989@apache.org>
---
 LICENSE-binary                                                  | 2 +-
 .../org/apache/hadoop/mapred/uploader/FrameworkUploader.java    | 2 +-
 hadoop-project/pom.xml                                          | 2 +-
 .../hadoop/yarn/applications/distributedshell/Client.java       | 2 +-
 .../applications/unmanagedamlauncher/UnmanagedAMLauncher.java   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index ada9deaff2..8e1fb1856d 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -244,7 +244,7 @@ com.microsoft.azure:azure-storage:7.0.0
 com.nimbusds:nimbus-jose-jwt:9.37.2
 com.zaxxer:HikariCP:4.0.3
 commons-beanutils:commons-beanutils:1.9.4
-commons-cli:commons-cli:1.5.0
+commons-cli:commons-cli:1.9.0
 commons-codec:commons-codec:1.15
 org.apache.commons:commons-collections4:4.4
 commons-daemon:commons-daemon:1.0.13
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
index 0408b6c1ea..b8dc7886fa 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
@@ -560,7 +560,7 @@ boolean parseArguments(String[] args) throws IOException {
       ignoreSymlink = true;
     }
     String fs = parser.getCommandLine()
-        .getOptionValue("fs", null);
+        .getOptionValue("fs", () -> null);
     String path = parser.getCommandLine().getOptionValue("target",
         "/usr/lib/mr-framework.tar.gz#mr-framework");
     boolean isFullPath =
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index faf76544af..2678f21a4b 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -119,7 +119,7 @@
 
     <!-- Apache Commons dependencies -->
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
-    <commons-cli.version>1.5.0</commons-cli.version>
+    <commons-cli.version>1.9.0</commons-cli.version>
     <commons-codec.version>1.15</commons-codec.version>
     <commons-collections4.version>4.4</commons-collections4.version>
     <commons-compress.version>1.26.1</commons-compress.version>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
index 2987165486..6291fbf1a9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
@@ -586,7 +586,7 @@ public boolean init(String[] args) throws ParseException {
           + " exiting. Specified numContainer=" + numContainers);
     }
     
-    nodeLabelExpression = cliParser.getOptionValue("node_label_expression", null);
+    nodeLabelExpression = cliParser.getOptionValue("node_label_expression", () -> null);
 
     clientTimeout = Integer.parseInt(cliParser.getOptionValue("timeout", "600000"));
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java
index c6fe29f65f..37b3477c8c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java
@@ -160,7 +160,7 @@ public boolean init(String[] args) throws ParseException {
     appName = cliParser.getOptionValue("appname", "UnmanagedAM");
     amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
     amQueue = cliParser.getOptionValue("queue", "default");
-    classpath = cliParser.getOptionValue("classpath", null);
+    classpath = cliParser.getOptionValue("classpath", () ->null);
 
     amCmd = cliParser.getOptionValue("cmd");
     if (amCmd == null) {