浏览代码

YARN-11092. Upgrade jquery ui to 1.13.1 (#4260)

Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 931abbd92706aa5377ba303b7b09f0adf1d8e1c7)

 Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java

Change-Id: I5d5f729aa0c778298d753ff5400b33b5e95edd5d
Ashutosh Gupta 3 年之前
父节点
当前提交
f938ca9874

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml

@@ -244,8 +244,8 @@
             <exclude>src/main/resources/webapps/static/dt-1.10.18/images/Sorting icons.psd</exclude>
             <exclude>src/main/resources/webapps/static/dt-1.10.18/js/jquery.dataTables.min.js</exclude>
             <exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</exclude>
-            <exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js</exclude>
-            <exclude>src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js</exclude>
+            <exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.13.1.custom.min.js</exclude>
+            <exclude>src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js</exclude>
             <exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
             <exclude>src/test/resources/application_1440536969523_0001.har/_index</exclude>
             <exclude>src/test/resources/application_1440536969523_0001.har/part-0</exclude>

+ 7 - 8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java

@@ -18,18 +18,17 @@
 
 package org.apache.hadoop.yarn.webapp.view;
 
-import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
-import static org.apache.hadoop.yarn.util.StringHelper.djoin;
-import static org.apache.hadoop.yarn.util.StringHelper.join;
-import static org.apache.hadoop.yarn.util.StringHelper.split;
-
 import java.util.List;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;
-
 import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
 
+import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
+import static org.apache.hadoop.yarn.util.StringHelper.djoin;
+import static org.apache.hadoop.yarn.util.StringHelper.join;
+import static org.apache.hadoop.yarn.util.StringHelper.split;
+
 @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"})
 public class JQueryUI extends HtmlBlock {
 
@@ -69,8 +68,8 @@ public class JQueryUI extends HtmlBlock {
         .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.5.1.min.js"))
-        .script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js"))
+        .script(root_url("static/jquery/jquery-3.6.0.min.js"))
+        .script(root_url("static/jquery/jquery-ui-1.13.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"))
         .script(root_url("static/dt-sorting/natural.js"))

文件差异内容过多而无法显示
+ 0 - 5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js


文件差异内容过多而无法显示
+ 5 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.13.1.custom.min.js


部分文件因为文件数量过多而无法显示