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/pom.xml
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
This commit is contained in:
parent
48ca153100
commit
45e5b71a1d
|
@ -241,7 +241,7 @@
|
|||
<exclude>src/main/resources/webapps/static/dt-1.10.7/images/Sorting icons.psd</exclude>
|
||||
<exclude>src/main/resources/webapps/static/dt-1.10.7/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-ui-1.13.1.custom.min.js</exclude>
|
||||
<exclude>src/main/resources/webapps/static/jquery/jquery-3.3.1.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>
|
||||
|
|
|
@ -18,11 +18,6 @@
|
|||
|
||||
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;
|
||||
|
@ -30,6 +25,11 @@ import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;
|
|||
|
||||
import 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 {
|
||||
|
||||
|
@ -68,7 +68,7 @@ public class JQueryUI extends HtmlBlock {
|
|||
html.link(root_url("static/jquery/themes-1.9.1/base/jquery-ui.css"))
|
||||
.link(root_url("static/dt-1.10.7/css/jui-dt.css"))
|
||||
.script(root_url("static/jquery/jquery-3.3.1.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.7/js/jquery.dataTables.min.js"))
|
||||
.script(root_url("static/yarn.dt.plugins.js"))
|
||||
.script(root_url("static/dt-sorting/natural.js"))
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue