Browse Source

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>
Ashutosh Gupta 3 years ago
parent
commit
931abbd927

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

@@ -258,7 +258,7 @@
             <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/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/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/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-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/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/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/_index</exclude>

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

@@ -20,15 +20,15 @@ package org.apache.hadoop.yarn.webapp.view;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.util.Lists;
+import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;
+
 import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
 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.djoin;
 import static org.apache.hadoop.yarn.util.StringHelper.join;
 import static org.apache.hadoop.yarn.util.StringHelper.join;
 import static org.apache.hadoop.yarn.util.StringHelper.split;
 import static org.apache.hadoop.yarn.util.StringHelper.split;
 
 
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.util.Lists;
-import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;
-
 @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"})
 @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"})
 public class JQueryUI extends HtmlBlock {
 public class JQueryUI extends HtmlBlock {
 
 
@@ -69,7 +69,7 @@ public class JQueryUI extends HtmlBlock {
         .link(root_url("static/dt-1.10.18/css/jui-dt.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"))
         .link(root_url("static/dt-1.10.18/css/custom_datatable.css"))
         .script(root_url("static/jquery/jquery-3.6.0.min.js"))
         .script(root_url("static/jquery/jquery-3.6.0.min.js"))
-        .script(root_url("static/jquery/jquery-ui-1.12.1.custom.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/dt-1.10.18/js/jquery.dataTables.min.js"))
         .script(root_url("static/yarn.dt.plugins.js"))
         .script(root_url("static/yarn.dt.plugins.js"))
         .script(root_url("static/dt-sorting/natural.js"))
         .script(root_url("static/dt-sorting/natural.js"))

File diff suppressed because it is too large
+ 0 - 5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js


File diff suppressed because it is too large
+ 5 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.13.1.custom.min.js


Some files were not shown because too many files changed in this diff