Revert "YARN-8633. Update DataTables version in yarn-common in line w…

…ith JQuery 3 upgrade. Contributed by Akhil PB." This reverts commit 64901ab.
leety1228 · Aug 8, 2018 · 5b898c1 · 5b898c1
1 parent 64901ab
commit 5b898c1
Show file tree

Hide file tree

Showing 19 changed files with 164 additions and 167 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -553,7 +553,7 @@ For:
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
-hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/
+hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/
 --------------------------------------------------------------------------------
 Copyright (C) 2008-2016, SpryMedia Ltd.
 

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -237,10 +237,10 @@
             <exclude>src/main/resources/webapps/test/.keep</exclude>
             <exclude>src/main/resources/webapps/proxy/.keep</exclude>
             <exclude>src/main/resources/webapps/node/.keep</exclude>
-            <exclude>src/main/resources/webapps/static/dt-1.10.7/css/jui-dt.css</exclude>
-            <exclude>src/main/resources/webapps/static/dt-1.10.7/css/demo_table.css</exclude>
-            <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/dt-1.9.4/css/jui-dt.css</exclude>
+            <exclude>src/main/resources/webapps/static/dt-1.9.4/css/demo_table.css</exclude>
+            <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.12.1.custom.min.js</exclude>
             <exclude>src/main/resources/webapps/static/jquery/jquery-3.3.1.min.js</exclude>

diff --git a/...op-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java b/...op-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
@@ -66,10 +66,10 @@ public class JQueryUI extends HtmlBlock {
   @Override
   protected void render(Block html) {
     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"))
+        .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.12.1.custom.min.js"))
-        .script(root_url("static/dt-1.10.7/js/jquery.dataTables.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"))
         .style("#jsnotice { padding: 0.2em; text-align: center; }",

diff --git a/...adoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/js/jquery.dataTables.min.js b/...adoop-yarn-common/src/main/resources/webapps/static/dt-1.10.7/js/jquery.dataTables.min.js
diff --git a/...ebapps/static/dt-1.10.7/css/demo_page.css → ...webapps/static/dt-1.9.4/css/demo_page.css b/...ebapps/static/dt-1.10.7/css/demo_page.css → ...webapps/static/dt-1.9.4/css/demo_page.css
diff --git a/...bapps/static/dt-1.10.7/css/demo_table.css → ...ebapps/static/dt-1.9.4/css/demo_table.css b/...bapps/static/dt-1.10.7/css/demo_table.css → ...ebapps/static/dt-1.9.4/css/demo_table.css
diff --git a/...s/webapps/static/dt-1.10.7/css/jui-dt.css → ...es/webapps/static/dt-1.9.4/css/jui-dt.css b/...s/webapps/static/dt-1.10.7/css/jui-dt.css → ...es/webapps/static/dt-1.9.4/css/jui-dt.css
diff --git a/...static/dt-1.10.7/images/Sorting icons.psd → .../static/dt-1.9.4/images/Sorting icons.psd b/...static/dt-1.10.7/images/Sorting icons.psd → .../static/dt-1.9.4/images/Sorting icons.psd
diff --git a/...static/dt-1.10.7/images/back_disabled.jpg → .../static/dt-1.9.4/images/back_disabled.jpg b/...static/dt-1.10.7/images/back_disabled.jpg → .../static/dt-1.9.4/images/back_disabled.jpg
diff --git a/.../static/dt-1.10.7/images/back_enabled.jpg → ...s/static/dt-1.9.4/images/back_enabled.jpg b/.../static/dt-1.10.7/images/back_enabled.jpg → ...s/static/dt-1.9.4/images/back_enabled.jpg
diff --git a/...bapps/static/dt-1.10.7/images/favicon.ico → ...ebapps/static/dt-1.9.4/images/favicon.ico b/...bapps/static/dt-1.10.7/images/favicon.ico → ...ebapps/static/dt-1.9.4/images/favicon.ico
diff --git a/...tic/dt-1.10.7/images/forward_disabled.jpg → ...atic/dt-1.9.4/images/forward_disabled.jpg b/...tic/dt-1.10.7/images/forward_disabled.jpg → ...atic/dt-1.9.4/images/forward_disabled.jpg
diff --git a/...atic/dt-1.10.7/images/forward_enabled.jpg → ...tatic/dt-1.9.4/images/forward_enabled.jpg b/...atic/dt-1.10.7/images/forward_enabled.jpg → ...tatic/dt-1.9.4/images/forward_enabled.jpg
diff --git a/...apps/static/dt-1.10.7/images/sort_asc.png → ...bapps/static/dt-1.9.4/images/sort_asc.png b/...apps/static/dt-1.10.7/images/sort_asc.png → ...bapps/static/dt-1.9.4/images/sort_asc.png
diff --git a/...ic/dt-1.10.7/images/sort_asc_disabled.png → ...tic/dt-1.9.4/images/sort_asc_disabled.png b/...ic/dt-1.10.7/images/sort_asc_disabled.png → ...tic/dt-1.9.4/images/sort_asc_disabled.png
diff --git a/...pps/static/dt-1.10.7/images/sort_both.png → ...apps/static/dt-1.9.4/images/sort_both.png b/...pps/static/dt-1.10.7/images/sort_both.png → ...apps/static/dt-1.9.4/images/sort_both.png
diff --git a/...pps/static/dt-1.10.7/images/sort_desc.png → ...apps/static/dt-1.9.4/images/sort_desc.png b/...pps/static/dt-1.10.7/images/sort_desc.png → ...apps/static/dt-1.9.4/images/sort_desc.png
diff --git a/...c/dt-1.10.7/images/sort_desc_disabled.png → ...ic/dt-1.9.4/images/sort_desc_disabled.png b/...c/dt-1.10.7/images/sort_desc_disabled.png → ...ic/dt-1.9.4/images/sort_desc_disabled.png
diff --git a/...hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/js/jquery.dataTables.min.js b/...hadoop-yarn-common/src/main/resources/webapps/static/dt-1.9.4/js/jquery.dataTables.min.js