Browse Source

YARN-8426:Upgrade jquery-ui to 1.12.1 in YARN. Contributed by Sunil Govindan

(cherry picked from commit 361ffb26bebf2491bbe3219ef4a83eb753660018)
Bharat Viswanadham 7 years ago
parent
commit
5430aab133

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

@@ -242,7 +242,7 @@
             <exclude>src/main/resources/webapps/static/dt-1.9.4/images/Sorting icons.psd</exclude>
             <exclude>src/main/resources/webapps/static/dt-1.9.4/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.9.1.custom.min.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.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>

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

@@ -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.9.4/css/jui-dt.css"))
         .script(root_url("static/jquery/jquery-3.3.1.min.js"))
-        .script(root_url("static/jquery/jquery-ui-1.9.1.custom.min.js"))
+        .script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js"))
         .script(root_url("static/dt-1.9.4/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 it is too large
+ 5 - 0
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
+ 0 - 5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.9.1.custom.min.js


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