This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 57d821e6aad HADOOP-19143. Upgrade commons-cli to 1.9.0. (#7126)
(#7146) Contributed by Min Yan.
57d821e6aad is described below
commit 57d821e6aad23b604833272071c8481567363e63
Author: yanmin <myan...@163.com>
AuthorDate: Fri Dec 13 18:29:45 2024 +0800
HADOOP-19143. Upgrade commons-cli to 1.9.0. (#7126) (#7146) Contributed by
Min Yan.
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
LICENSE-binary | 2 +-
.../main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java | 2 +-
hadoop-project/pom.xml | 2 +-
.../org/apache/hadoop/yarn/applications/distributedshell/Client.java | 2 +-
.../yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 6b2decb9fdf..778e1e8d7f4 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -243,7 +243,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 0408b6c1eac..b8dc7886fab 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 @@ public class FrameworkUploader implements Runnable {
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 cc934469285..49ff34334f2 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 2987165486e..6291fbf1a9f 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 class Client {
+ " 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 c6fe29f65fb..37b3477c8c1 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 class UnmanagedAMLauncher {
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
