From d146ab3af71cd3265679ccc51f50e6c88d61b740 Mon Sep 17 00:00:00 2001 From: Szilard Nemeth Date: Fri, 21 May 2021 18:07:32 +0200 Subject: [PATCH] YARN-10766. [UI2] Bump moment-timezone to 0.5.33. Contributed by Andras Gyori --- .../hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json | 2 +- .../hadoop-yarn-ui/src/main/webapp/config/environment.js | 4 ++++ .../hadoop-yarn-ui/src/main/webapp/ember-cli-build.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json index 9b5cc9fb9f..0ef1367c24 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json @@ -13,7 +13,7 @@ "qunit": "1.19.0", "jquery-ui": "1.11.4", "moment": "2.12.0", - "moment-timezone": "0.5.1", + "moment-timezone": "0.5.33", "more-js": "0.8.2", "bootstrap": "3.3.6", "d3": "~3.5.6", diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js index 3ff3c02984..c6ed5ed3a0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js @@ -33,6 +33,10 @@ module.exports = function(environment) { } }, + moment: { + includeTimezone: 'all' + }, + APP: DEFAULT_CONFIG, contentSecurityPolicy: { 'connect-src': "* 'self'", diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js index c4bb95f0e7..09da39b4ec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js @@ -42,7 +42,7 @@ module.exports = function(defaults) { app.import("bower_components/datatables/media/css/jquery.dataTables.min.css"); app.import("bower_components/datatables/media/js/jquery.dataTables.min.js"); app.import("bower_components/momentjs/min/moment.min.js"); - app.import("bower_components/moment-timezone/builds/moment-timezone-with-data-2010-2020.min.js"); + app.import("bower_components/moment-timezone/builds/moment-timezone-with-data-10-year-range.min.js"); app.import("bower_components/select2/dist/css/select2.min.css"); app.import("bower_components/select2/dist/js/select2.min.js"); app.import('bower_components/jquery-ui/jquery-ui.js');