From 4c22960836eebe082c01ea2545f9cea5eeb06526 Mon Sep 17 00:00:00 2001
From: luoyuan3471 <46600375+luoyuan3471@users.noreply.github.com>
Date: Wed, 12 Jan 2022 11:40:32 +0800
Subject: [PATCH] HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (#3791)
Co-authored-by: luoyuan
(cherry picked from commit e2d620192aa0b712d05e4092eb63ef2ccdcd8220)
---
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 | 2 +-
.../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 | 2 +-
.../hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +-
.../hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js | 2 --
.../hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js | 2 ++
.../main/resources/webapps/static/jquery/jquery-3.5.1.min.js | 2 --
.../main/resources/webapps/static/jquery/jquery-3.6.0.min.js | 2 ++
14 files changed, 14 insertions(+), 14 deletions(-)
delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js
create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js
diff --git a/LICENSE-binary b/LICENSE-binary
index 9734aa895850d..03c42f4deca26 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -406,7 +406,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.5.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.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 efb8745578bc6..9db61788de794 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -243,7 +243,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.5.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.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 49c3e6606accc..15f7d7feb3848 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
@@ -311,7 +311,7 @@ Delete
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 6f172e82adf01..2e4c2991f99e4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -412,7 +412,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.5.1.min.js
+ src/main/webapps/static/jquery-3.6.0.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 b680f0a37e1ec..caab81ef686b9 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
@@ -126,7 +126,7 @@
{/dn.VolumeInfo}
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 69e3495fb62a5..ad5c30fe597ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -492,7 +492,7 @@
-
-
-
+
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
index 41a468d4cfd80..a3484fbcb6a88 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
@@ -86,7 +86,7 @@
{/snn}
-