Skip to content

Commit 45e5b71

Browse files
hotcodemachaaajisaka
authored andcommitted
YARN-11092. Upgrade jquery ui to 1.13.1 (#4260)
Co-authored-by: Ashutosh Gupta <[email protected]> Signed-off-by: Akira Ajisaka <[email protected]> (cherry picked from commit 931abbd) 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
1 parent 48ca153 commit 45e5b71

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<exclude>src/main/resources/webapps/static/dt-1.10.7/images/Sorting icons.psd</exclude>
242242
<exclude>src/main/resources/webapps/static/dt-1.10.7/js/jquery.dataTables.min.js</exclude>
243243
<exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</exclude>
244-
<exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js</exclude>
244+
<exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.13.1.custom.min.js</exclude>
245245
<exclude>src/main/resources/webapps/static/jquery/jquery-3.3.1.min.js</exclude>
246246
<exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
247247
<exclude>src/test/resources/application_1440536969523_0001.har/_index</exclude>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818

1919
package org.apache.hadoop.yarn.webapp.view;
2020

21-
import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
22-
import static org.apache.hadoop.yarn.util.StringHelper.djoin;
23-
import static org.apache.hadoop.yarn.util.StringHelper.join;
24-
import static org.apache.hadoop.yarn.util.StringHelper.split;
25-
2621
import java.util.List;
2722

2823
import org.apache.hadoop.classification.InterfaceAudience;
2924
import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;
3025

3126
import com.google.common.collect.Lists;
3227

28+
import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
29+
import static org.apache.hadoop.yarn.util.StringHelper.djoin;
30+
import static org.apache.hadoop.yarn.util.StringHelper.join;
31+
import static org.apache.hadoop.yarn.util.StringHelper.split;
32+
3333
@InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"})
3434
public class JQueryUI extends HtmlBlock {
3535

@@ -68,7 +68,7 @@ protected void render(Block html) {
6868
html.link(root_url("static/jquery/themes-1.9.1/base/jquery-ui.css"))
6969
.link(root_url("static/dt-1.10.7/css/jui-dt.css"))
7070
.script(root_url("static/jquery/jquery-3.3.1.min.js"))
71-
.script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js"))
71+
.script(root_url("static/jquery/jquery-ui-1.13.1.custom.min.js"))
7272
.script(root_url("static/dt-1.10.7/js/jquery.dataTables.min.js"))
7373
.script(root_url("static/yarn.dt.plugins.js"))
7474
.script(root_url("static/dt-sorting/natural.js"))

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.13.1.custom.min.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)