浏览代码

HADOOP-17283. Hadoop - Upgrade to jQuery 3.5.1 (#2330)

Signed-off-by: Takanobu Asanuma <tasanuma@apache.org>
Aryan Gupta 4 年之前
父节点
当前提交
486ddb73f9

+ 1 - 1
LICENSE-binary

@@ -405,7 +405,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js

+ 1 - 1
LICENSE.txt

@@ -245,7 +245,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
-hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
 hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html

@@ -310,7 +310,7 @@
         </ul>
       </p>
     </script>
-    <script type="text/javascript" src="/static/jquery-3.4.1.min.js">
+    <script type="text/javascript" src="/static/jquery-3.5.1.min.js">
     </script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
     </script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
     </script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap-editable.min.js">

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html

@@ -496,7 +496,7 @@ No nodes are decommissioning.
 
 
 
-<script type="text/javascript" src="static/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src="static/jquery-3.5.1.min.js"></script>
 <script type="text/javascript" src="static/jquery.dataTables.min.js"></script>
 <script type="text/javascript" src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="static/dataTables.bootstrap.js"></script>

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -416,7 +416,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
             <exclude>src/main/webapps/static/moment.min.js</exclude>
             <exclude>src/main/webapps/static/dust-full-2.0.0.min.js</exclude>
             <exclude>src/main/webapps/static/dust-helpers-1.1.1.min.js</exclude>
-            <exclude>src/main/webapps/static/jquery-3.4.1.min.js</exclude>
+            <exclude>src/main/webapps/static/jquery-3.5.1.min.js</exclude>
             <exclude>src/main/webapps/static/jquery.dataTables.min.js</exclude>
             <exclude>src/main/webapps/static/json-bignum.js</exclude>
             <exclude>src/main/webapps/static/dataTables.bootstrap.css</exclude>

+ 2 - 2
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html

@@ -125,7 +125,7 @@
   {/dn.VolumeInfo}
 </script>
 
-<script type="text/javascript" src="/static/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src="/static/jquery-3.5.1.min.js"></script>
 <script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="/static/moment.min.js"></script>
 <script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>
@@ -134,4 +134,4 @@
 <script type="text/javascript" src="dn.js"></script>
 
 </body>
-</html>
+</html>

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html

@@ -476,7 +476,7 @@ There are no reported volume failures.
 </table>
 </script>
 
-<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
+<script type="text/javascript" src="/static/jquery-3.5.1.min.js">
 </script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
 </script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
 </script><script type="text/javascript" src="/static/dataTables.bootstrap.js">

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html

@@ -310,7 +310,7 @@
         </ul>
       </p>
     </script>
-    <script type="text/javascript" src="/static/jquery-3.4.1.min.js">
+    <script type="text/javascript" src="/static/jquery-3.5.1.min.js">
     </script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
     </script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
     </script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap-editable.min.js">

+ 2 - 2
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/journalnode.html

@@ -96,7 +96,7 @@
   </table>
 </script>
 
-<script type="text/javascript" src="/static/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src="/static/jquery-3.5.1.min.js"></script>
 <script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="/static/moment.min.js"></script>
 <script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>
@@ -105,4 +105,4 @@
 <script type="text/javascript" src="jn.js"></script>
 
 </body>
-</html>
+</html>

+ 1 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html

@@ -86,7 +86,7 @@
 {/snn}
 </script>
 
-<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
+<script type="text/javascript" src="/static/jquery-3.5.1.min.js">
 </script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
 </script><script type="text/javascript" src="/static/moment.min.js">
 </script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">

文件差异内容过多而无法显示
+ 0 - 1
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js


文件差异内容过多而无法显示
+ 1 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js


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

@@ -242,7 +242,7 @@
             <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/jquery/jquery-ui-1.12.1.custom.min.js</exclude>
-            <exclude>src/main/resources/webapps/static/jquery/jquery-3.4.1.min.js</exclude>
+            <exclude>src/main/resources/webapps/static/jquery/jquery-3.5.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>
             <exclude>src/test/resources/application_1440536969523_0001.har/part-0</exclude>

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

@@ -69,7 +69,7 @@ public class JQueryUI extends HtmlBlock {
         .link(root_url("static/dt-1.10.18/css/jquery.dataTables.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"))
-        .script(root_url("static/jquery/jquery-3.4.1.min.js"))
+        .script(root_url("static/jquery/jquery-3.5.1.min.js"))
         .script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js"))
         .script(root_url("static/dt-1.10.18/js/jquery.dataTables.min.js"))
         .script(root_url("static/yarn.dt.plugins.js"))

部分文件因为文件数量过多而无法显示