From cbde7e86bbe328b3c003ad74072d05a910cad4ea Mon Sep 17 00:00:00 2001
From: Aswin Shakil Balasubramanian <aswinshakilbalu@gmail.com>
Date: Mon, 31 Jan 2022 16:29:55 -0800
Subject: [PATCH 1/3] HADOOP-18101. Bump aliyun-sdk-oss to 3.13.1

---
 LICENSE-binary         | 2 +-
 hadoop-project/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 87015872e3308..6eb7acfb87349 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -214,7 +214,7 @@ com.aliyun:aliyun-java-sdk-core:3.4.0
 com.aliyun:aliyun-java-sdk-ecs:4.2.0
 com.aliyun:aliyun-java-sdk-ram:3.0.0
 com.aliyun:aliyun-java-sdk-sts:3.0.0
-com.aliyun.oss:aliyun-sdk-oss:3.13.0
+com.aliyun.oss:aliyun-sdk-oss:3.13.1
 com.amazonaws:aws-java-sdk-bundle:1.11.901
 com.cedarsoftware:java-util:1.9.0
 com.cedarsoftware:json-io:2.5.1
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 71a2a3b90f826..118dd83d7f465 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1495,7 +1495,7 @@
       <dependency>
         <groupId>com.aliyun.oss</groupId>
         <artifactId>aliyun-sdk-oss</artifactId>
-        <version>3.13.0</version>
+        <version>3.13.1</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.httpcomponents</groupId>

From 0a612ae7ba157b757693032d72eeb14a48c6aa7a Mon Sep 17 00:00:00 2001
From: Aswin Shakil Balasubramanian <aswinshakilbalu@gmail.com>
Date: Tue, 1 Feb 2022 18:18:35 -0800
Subject: [PATCH 2/3] HADOOP-18101. Removed jdom 2.0.6 dependency.

---
 LICENSE-binary         | 2 +-
 hadoop-project/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 6eb7acfb87349..d93c6e5dccfdb 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -514,7 +514,7 @@ org.hsqldb:hsqldb:2.3.4
 JDOM License
 ------------
 
-org.jdom:jdom:1.1
+org.jdom:jdom2:2.0.6.1
 
 
 Public Domain
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 118dd83d7f465..9db4a44f42e05 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -135,7 +135,7 @@
     <hikari.version>4.0.3</hikari.version>
     <mssql.version>6.2.1.jre7</mssql.version>
     <okhttp.version>2.7.5</okhttp.version>
-    <jdom.version>1.1</jdom.version>
+    <jdom.version>2.0.6.1</jdom.version>
     <jna.version>5.2.0</jna.version>
     <grizzly.version>2.2.21</grizzly.version>
     <gson.version>2.8.9</gson.version>
@@ -1289,7 +1289,7 @@
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>
-        <artifactId>jdom</artifactId>
+        <artifactId>jdom2</artifactId>
         <version>${jdom.version}</version>
       </dependency>
       <dependency>

From 2fae2efc9621a4f056d878e7a3ad001591b59fe7 Mon Sep 17 00:00:00 2001
From: Aswin Shakil Balasubramanian <aswinshakilbalu@gmail.com>
Date: Wed, 2 Feb 2022 15:17:22 -0800
Subject: [PATCH 3/3] HADOOP-18101. Bump aliyun-sdk-oss to 3.13.2

---
 LICENSE-binary         | 2 +-
 hadoop-project/pom.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index d93c6e5dccfdb..f1c0d87bbe626 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -214,7 +214,7 @@ com.aliyun:aliyun-java-sdk-core:3.4.0
 com.aliyun:aliyun-java-sdk-ecs:4.2.0
 com.aliyun:aliyun-java-sdk-ram:3.0.0
 com.aliyun:aliyun-java-sdk-sts:3.0.0
-com.aliyun.oss:aliyun-sdk-oss:3.13.1
+com.aliyun.oss:aliyun-sdk-oss:3.13.2
 com.amazonaws:aws-java-sdk-bundle:1.11.901
 com.cedarsoftware:java-util:1.9.0
 com.cedarsoftware:json-io:2.5.1
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 9db4a44f42e05..2fd3d018ab4be 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -135,7 +135,7 @@
     <hikari.version>4.0.3</hikari.version>
     <mssql.version>6.2.1.jre7</mssql.version>
     <okhttp.version>2.7.5</okhttp.version>
-    <jdom.version>2.0.6.1</jdom.version>
+    <jdom2.version>2.0.6.1</jdom2.version>
     <jna.version>5.2.0</jna.version>
     <grizzly.version>2.2.21</grizzly.version>
     <gson.version>2.8.9</gson.version>
@@ -1290,7 +1290,7 @@
       <dependency>
         <groupId>org.jdom</groupId>
         <artifactId>jdom2</artifactId>
-        <version>${jdom.version}</version>
+        <version>${jdom2.version}</version>
       </dependency>
       <dependency>
         <groupId>com.googlecode.json-simple</groupId>
@@ -1495,7 +1495,7 @@
       <dependency>
         <groupId>com.aliyun.oss</groupId>
         <artifactId>aliyun-sdk-oss</artifactId>
-        <version>3.13.1</version>
+        <version>3.13.2</version>
         <exclusions>
           <exclusion>
             <groupId>org.apache.httpcomponents</groupId>