HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (apache#3791)

Co-authored-by: luoyuan <[email protected]>
(cherry picked from commit e2d6201)

Author: 2 people

LICENSE-binary

@@ -282,11 +282,11 @@ http://sourceforge.net/projects/slicing-by-8/
  *
  * Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved
  *
- * This software program is licensed subject to the BSD License, 
+ * This software program is licensed subject to the BSD License,
  * available at http://www.opensource.org/licenses/bsd-license.html
  *
  * Abstract: The main routine
- * 
+ *
  --*/
 
 For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,lz4hc.h,lz4hc.c},
@@ -566,6 +566,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 For:
 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.6.0.min.js
+hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
 --------------------------------------------------------------------------------
 
 Copyright (c) 2010 Aleksander Williams

LICENSE.txt

@@ -424,14 +424,15 @@
 
 
 
-<script type="text/javascript" src="/static/jquery-3.4.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>
-<script type="text/javascript" src="/static/moment.min.js"></script>
-<script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>
-<script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js"></script>
-<script type="text/javascript" src="/static/dfs-dust.js"></script>
+<script type="text/javascript" src="static/jquery-3.6.0.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>
+<script type="text/javascript" src="static/moment.min.js"></script>
+<script type="text/javascript" src="static/dust-full-2.0.0.min.js"></script>
+<script type="text/javascript" src="static/dust-helpers-1.1.1.min.js"></script>
+<script type="text/javascript" src="static/dfs-dust.js"></script>
+<script type="text/javascript" src="/static/d3-v4.1.1.min.js"></script>
 <script type="text/javascript" src="federationhealth.js"></script>
 </body>
 </html>

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

@@ -379,7 +379,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.6.0.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>

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.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.6.0.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>

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

@@ -47,6 +47,7 @@
         <li><a href="jmx">Metrics</a></li>
         <li><a href="conf">Configuration</a></li>
         <li><a href="stacks">Process Thread Dump</a></li>
+        <li><a href="topology">Network Topology</a></li>
       </ul>
     </li>
   </ul>
@@ -475,7 +476,7 @@
 </table>
 </script>
 
-<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
+<script type="text/javascript" src="/static/jquery-3.6.0.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">

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

@@ -306,7 +306,7 @@ <h4 class="modal-title" id="delete-modal-title">Delete</h4>
         </ul>
       </p>
     </script>
-    <script type="text/javascript" src="/static/jquery-3.4.1.min.js">
+    <script type="text/javascript" src="/static/jquery-3.6.0.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">

hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.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.6.0.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">