From 3ff8f58f8cdccc70bebee7cde46b7ef8805b4b86 Mon Sep 17 00:00:00 2001
From: slfan1989 <55643692+slfan1989@users.noreply.github.com>
Date: Thu, 13 Oct 2022 14:40:54 +0800
Subject: [PATCH] HADOOP-18360. Update commons-csv from 1.0 to 1.9.0. (#4928).
 Contributed by fanshilun.

Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
---
 LICENSE-binary                                                  | 2 +-
 hadoop-project/pom.xml                                          | 2 +-
 .../timelineservice/storage/FileSystemTimelineReaderImpl.java   | 2 +-
 .../storage/TestFileSystemTimelineReaderImpl.java               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 8a1f46a0ea1..9dba36439ca 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -306,7 +306,7 @@ org.apache.avro:avro:1.9.2
 org.apache.commons:commons-collections4:4.2
 org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-configuration2:2.8.0
-org.apache.commons:commons-csv:1.0
+org.apache.commons:commons-csv:1.9.0
 org.apache.commons:commons-digester:1.8.1
 org.apache.commons:commons-lang3:3.12.0
 org.apache.commons:commons-math3:3.6.1
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 939eea584b7..bc03267d4a5 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -117,7 +117,7 @@
     <commons-codec.version>1.15</commons-codec.version>
     <commons-collections.version>3.2.2</commons-collections.version>
     <commons-compress.version>1.21</commons-compress.version>
-    <commons-csv.version>1.0</commons-csv.version>
+    <commons-csv.version>1.9.0</commons-csv.version>
     <commons-io.version>2.11.0</commons-io.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-logging.version>1.1.3</commons-logging.version>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
index 197fa5a4072..913b8360e2f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java
@@ -93,7 +93,7 @@ public class FileSystemTimelineReaderImpl extends AbstractService
   private static final String STORAGE_DIR_ROOT = "timeline_service_data";
 
   private final CSVFormat csvFormat =
-      CSVFormat.DEFAULT.withHeader("APP", "USER", "FLOW", "FLOWRUN");
+      CSVFormat.Builder.create().setHeader("APP", "USER", "FLOW", "FLOWRUN").build();
 
   public FileSystemTimelineReaderImpl() {
     super(FileSystemTimelineReaderImpl.class.getName());
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineReaderImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineReaderImpl.java
index 0b1897c8b83..cf94749e883 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineReaderImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineReaderImpl.java
@@ -77,7 +77,7 @@ public class TestFileSystemTimelineReaderImpl {
     loadEntityData(rootDir);
     // Create app flow mapping file.
     CSVFormat format =
-        CSVFormat.DEFAULT.withHeader("APP", "USER", "FLOW", "FLOWRUN");
+        CSVFormat.Builder.create().setHeader("APP", "USER", "FLOW", "FLOWRUN").build();
     String appFlowMappingFile = rootDir + File.separator + "entities" +
         File.separator + "cluster1" + File.separator +
         FileSystemTimelineReaderImpl.APP_FLOW_MAPPING_FILE;