From 6203f6dacb4337e48051b071debb7a8a72d7c991 Mon Sep 17 00:00:00 2001 From: Aryan Gupta Date: Wed, 23 Sep 2020 20:27:41 +0530 Subject: [PATCH 1/3] HDFS-15593. Hadoop - Upgrade to jQuery 3.5.1 --- .../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/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 ++ 8 files changed, 9 insertions(+), 9 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/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html index a9afe401fcb11..01751c21b1376 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html @@ -496,7 +496,7 @@ - + diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index e1ea5840deda5..911881347e933 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 39680e84a8c82..7301064651e2b 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 @@ - \ No newline at end of file + 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 27616fb6b9b6f..bb3cf4a475ca8 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 @@ -476,7 +476,7 @@ - - - - - + @@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 750ae7802158a..e7898fe447c0a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -242,7 +242,7 @@ src/main/resources/webapps/static/dt-1.10.18/js/jquery.dataTables.min.js src/main/resources/webapps/static/jt/jquery.jstree.js src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js - src/main/resources/webapps/static/jquery/jquery-3.4.1.min.js + src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css src/test/resources/application_1440536969523_0001.har/_index src/test/resources/application_1440536969523_0001.har/part-0 diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java index 4438da09e9f0b..37a6d58a790f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java @@ -69,7 +69,7 @@ protected void render(Block html) { .link(root_url("static/dt-1.10.18/css/jquery.dataTables.css")) .link(root_url("static/dt-1.10.18/css/jui-dt.css")) .link(root_url("static/dt-1.10.18/css/custom_datatable.css")) - .script(root_url("static/jquery/jquery-3.4.1.min.js")) + .script(root_url("static/jquery/jquery-3.5.1.min.js")) .script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js")) .script(root_url("static/dt-1.10.18/js/jquery.dataTables.min.js")) .script(root_url("static/yarn.dt.plugins.js"))