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 931abbd927)

 Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
This commit is contained in:
Ashutosh Gupta 2022-05-16 15:11:17 +01:00 committed by Akira Ajisaka
parent 1d226874d2
commit a50ce18f4d
4 changed files with 13 additions and 21 deletions

View File

@ -244,7 +244,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>

View File

@ -18,18 +18,17 @@
package org.apache.hadoop.yarn.webapp.view; 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 java.util.List;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML; import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;
import org.apache.hadoop.thirdparty.com.google.common.collect.Lists; 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"}) @InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"})
public class JQueryUI extends HtmlBlock { public class JQueryUI extends HtmlBlock {
@ -70,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"))