From d7c375da40234338e654ceffee70a96c89a187eb Mon Sep 17 00:00:00 2001 From: Tamas Domok Date: Thu, 3 Mar 2022 15:54:03 +0100 Subject: [PATCH] YARN-11076. Upgrade jQuery version in Yarn UI2. (#4046) Change-Id: I3cb1677741df5a1978e83029443d4a2d5d7e3d7f (cherry picked from commit 22fe79cee3a3dcc4c3976a64145d5f1b016c4416) --- .../hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json | 9 ++++++--- .../hadoop-yarn-ui/src/main/webapp/bower.json | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json index ffe380595b..2ce4628116 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json @@ -9,7 +9,8 @@ "2.2.0": "49e042ca89922ed96b27488c2a98add280ae7123" }, "https://github.com/components/jqueryui.git": { - "1.11.4": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1" + "1.11.4": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1", + "1.12.1": "44ecf3794cc56b65954cc19737234a3119d036cc" }, "https://github.com/dockyard/ember-qunit-notifications.git": { "0.1.0": "a83277aa7a1c0545c66e6d133caebb9a620e71ad" @@ -33,7 +34,8 @@ "4.0.0": "80eb44bec78568b152dc5547269c164cb7b5363c" }, "https://github.com/jquery/jquery-dist.git": { - "2.1.4": "7751e69b615c6eca6f783a81e292a55725af6b85" + "2.1.4": "7751e69b615c6eca6f783a81e292a55725af6b85", + "3.6.0": "e786e3d9707ffd9b0dd330ca135b66344dcef85a" }, "https://github.com/jquery/qunit.git": { "1.19.0": "467e7e34652ad7d5883ce9c568461cf8c5e172a8" @@ -61,6 +63,7 @@ "3.3.0": "ac909550c9544325632542bbea97531cc60bc628" }, "https://github.com/twbs/bootstrap.git": { - "3.3.6": "81df608a40bf0629a1dc08e584849bb1e43e0b7a" + "3.3.6": "81df608a40bf0629a1dc08e584849bb1e43e0b7a", + "3.4.1": "3.4.1" } } \ No newline at end of file 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 68d1ed021b..c63aa11c7e 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 @@ -8,14 +8,14 @@ "ember-load-initializers": "0.1.7", "ember-qunit": "0.4.16", "ember-qunit-notifications": "0.1.0", - "jquery": "2.1.4", + "jquery": "3.6.0", "loader.js": "3.3.0", "qunit": "1.19.0", - "jquery-ui": "1.11.4", + "jquery-ui": "1.12.1", "moment": "2.12.0", "moment-timezone": "0.5.1", "more-js": "0.8.2", - "bootstrap": "3.3.6", + "bootstrap": "3.4.1", "d3": "~3.5.6", "datatables": "~1.10.8", "spin.js": "~2.3.2",