From bd9246232123416201eb8c257b3cd8ab0ad32664 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Tue, 20 Aug 2019 18:42:19 +0530 Subject: [PATCH] HDFS-14729. Upgrade Bootstrap and jQuery versions used in HDFS UIs. Contributed by Vivek Ratnavel Subramanian. This closes #1297 --- LICENSE.txt | 4 +- .../main/webapps/router/federationhealth.html | 6 +- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 +- .../src/main/webapps/datanode/datanode.html | 6 +- .../src/main/webapps/hdfs/dfshealth.html | 6 +- .../src/main/webapps/hdfs/explorer.html | 10 +- .../src/main/webapps/journal/index.html | 6 +- .../src/main/webapps/secondary/status.html | 6 +- .../css/bootstrap-theme.css.map | 1 - .../css/bootstrap-theme.min.css.map | 1 - .../bootstrap-3.3.7/css/bootstrap.css.map | 1 - .../bootstrap-3.3.7/css/bootstrap.min.css | 6 - .../bootstrap-3.3.7/css/bootstrap.min.css.map | 1 - .../bootstrap-3.3.7/js/bootstrap.min.js | 7 - .../css/bootstrap-editable.css | 0 .../css/bootstrap-theme.css | 200 ++-- .../css/bootstrap-theme.css.map | 1 + .../css/bootstrap-theme.min.css | 6 +- .../css/bootstrap-theme.min.css.map | 1 + .../css/bootstrap.css | 985 ++++++++++-------- .../bootstrap-3.4.1/css/bootstrap.css.map | 1 + .../bootstrap-3.4.1/css/bootstrap.min.css | 6 + .../bootstrap-3.4.1/css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../js/bootstrap-editable.min.js | 0 .../js/bootstrap.js | 397 +++++-- .../bootstrap-3.4.1/js/bootstrap.min.js | 6 + .../js/npm.js | 0 .../main/webapps/static/jquery-3.3.1.min.js | 2 - .../main/webapps/static/jquery-3.4.1.min.js | 2 + .../om/ScmBlockLocationTestingClient.java | 195 ---- 35 files changed, 976 insertions(+), 892 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap-theme.css.map delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap-theme.min.css.map delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap.css.map delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap.min.css delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap.min.css.map delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/js/bootstrap.min.js rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/css/bootstrap-editable.css (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/css/bootstrap-theme.css (72%) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1/css/bootstrap-theme.css.map rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/css/bootstrap-theme.min.css (90%) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1/css/bootstrap-theme.min.css.map rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/css/bootstrap.css (90%) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1/css/bootstrap.css.map create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1/css/bootstrap.min.css create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1/css/bootstrap.min.css.map rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/fonts/glyphicons-halflings-regular.eot (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/fonts/glyphicons-halflings-regular.svg (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/fonts/glyphicons-halflings-regular.ttf (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/fonts/glyphicons-halflings-regular.woff (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/fonts/glyphicons-halflings-regular.woff2 (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/js/bootstrap-editable.min.js (100%) rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/js/bootstrap.js (86%) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1/js/bootstrap.min.js rename hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/{bootstrap-3.3.7 => bootstrap-3.4.1}/js/npm.js (100%) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.3.1.min.js create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js delete mode 100644 hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ScmBlockLocationTestingClient.java diff --git a/LICENSE.txt b/LICENSE.txt index 5d12a823150..f32f7a5887c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -617,7 +617,7 @@ OTHER DEALINGS IN THE SOFTWARE. The binary distribution of this product bundles these dependencies under the following license: -hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7 +hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css @@ -761,7 +761,7 @@ THE SOFTWARE. For: -hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.3.1.min.js +hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 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 105755d4393..e6214db0a6b 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 @@ -19,7 +19,7 @@ - + Router Information @@ -426,9 +426,9 @@ - + - + diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index ac01ca72a44..13da1764241 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -391,11 +391,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> src/main/webapps/secondary/robots.txt src/contrib/** src/site/resources/images/* - src/main/webapps/static/bootstrap-3.3.7/** + src/main/webapps/static/bootstrap-3.4.1/** 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.3.1.min.js + src/main/webapps/static/jquery-3.4.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 ad4d4345f10..8341b7b84c1 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 @@ -19,7 +19,7 @@ - + DataNode Information @@ -171,8 +171,8 @@ {/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 769315ec683..366c80fcc13 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 @@ -19,7 +19,7 @@ - + Namenode information @@ -475,9 +475,9 @@ There are no reported volume failures. - - -