From 28079e9c30d98542b657a09aa42fe4122a2a6334 Mon Sep 17 00:00:00 2001
From: Aryan Gupta <44232823+aryangupta1998@users.noreply.github.com>
Date: Thu, 24 Sep 2020 17:45:55 +0530
Subject: [PATCH] HADOOP-17283. Hadoop - Upgrade to jQuery 3.5.1 (#2330)
Signed-off-by: Takanobu Asanuma
(cherry picked from commit 486ddb73f9999693177787e4abff7c932be9b925)
---
LICENSE-binary | 2 +-
LICENSE.txt | 2 +-
.../hadoop-hdfs-rbf/src/main/webapps/router/explorer.html | 2 +-
.../src/main/webapps/router/federationhealth.html | 2 +-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +-
.../hadoop-hdfs/src/main/webapps/datanode/datanode.html | 4 ++--
.../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 2 +-
.../hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 2 +-
.../hadoop-hdfs/src/main/webapps/journal/journalnode.html | 4 ++--
.../hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +-
.../hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js | 2 --
.../hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js | 2 ++
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml | 2 +-
.../java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java | 2 +-
14 files changed, 16 insertions(+), 16 deletions(-)
delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js
create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
diff --git a/LICENSE-binary b/LICENSE-binary
index c3653f9b04..be1b797452 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -405,7 +405,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
diff --git a/LICENSE.txt b/LICENSE.txt
index c8e90f27f2..3c079898b9 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -245,7 +245,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
index 1f45f4d16c..80b38e7165 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
@@ -310,7 +310,7 @@ Delete
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index db97f7096b..d23b45c7dd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -416,7 +416,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
src/main/webapps/static/moment.min.js
src/main/webapps/static/dust-full-2.0.0.min.js
src/main/webapps/static/dust-helpers-1.1.1.min.js
- src/main/webapps/static/jquery-3.4.1.min.js
+ src/main/webapps/static/jquery-3.5.1.min.js
src/main/webapps/static/jquery.dataTables.min.js
src/main/webapps/static/json-bignum.js
src/main/webapps/static/dataTables.bootstrap.css
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
index 39680e84a8..7301064651 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
@@ -125,7 +125,7 @@
{/dn.VolumeInfo}
-
+
@@ -134,4 +134,4 @@