Skip to content

Commit e2d6201

Browse files
luoyuan3471luoyuan
and
luoyuan
authored
HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (apache#3791)
Co-authored-by: luoyuan <[email protected]>
1 parent 21fe0e6 commit e2d6201

File tree

16 files changed

+16
-16
lines changed

16 files changed

+16
-16
lines changed

LICENSE-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
404404
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
405405
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
406406
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
407-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
407+
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
408408
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
409409
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
410410
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.css
245245
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dataTables.bootstrap.js
246246
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-full-2.0.0.min.js
247247
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/dust-helpers-1.1.1.min.js
248-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
248+
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
249249
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery.dataTables.min.js
250250
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
251251
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ <h4 class="modal-title" id="delete-modal-title">Delete</h4>
311311
</ul>
312312
</p>
313313
</script>
314-
<script type="text/javascript" src="/static/jquery-3.5.1.min.js">
314+
<script type="text/javascript" src="/static/jquery-3.6.0.min.js">
315315
</script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
316316
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
317317
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap-editable.min.js">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499

500500

501501

502-
<script type="text/javascript" src="static/jquery-3.5.1.min.js"></script>
502+
<script type="text/javascript" src="static/jquery-3.6.0.min.js"></script>
503503
<script type="text/javascript" src="static/jquery.dataTables.min.js"></script>
504504
<script type="text/javascript" src="static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
505505
<script type="text/javascript" src="static/dataTables.bootstrap.js"></script>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
422422
<exclude>src/main/webapps/static/moment.min.js</exclude>
423423
<exclude>src/main/webapps/static/dust-full-2.0.0.min.js</exclude>
424424
<exclude>src/main/webapps/static/dust-helpers-1.1.1.min.js</exclude>
425-
<exclude>src/main/webapps/static/jquery-3.5.1.min.js</exclude>
425+
<exclude>src/main/webapps/static/jquery-3.6.0.min.js</exclude>
426426
<exclude>src/main/webapps/static/jquery.dataTables.min.js</exclude>
427427
<exclude>src/main/webapps/static/json-bignum.js</exclude>
428428
<exclude>src/main/webapps/static/dataTables.bootstrap.css</exclude>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
{/dn.VolumeInfo}
127127
</script>
128128

129-
<script type="text/javascript" src="/static/jquery-3.5.1.min.js"></script>
129+
<script type="text/javascript" src="/static/jquery-3.6.0.min.js"></script>
130130
<script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
131131
<script type="text/javascript" src="/static/moment.min.js"></script>
132132
<script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
</table>
480480
</script>
481481

482-
<script type="text/javascript" src="/static/jquery-3.5.1.min.js">
482+
<script type="text/javascript" src="/static/jquery-3.6.0.min.js">
483483
</script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
484484
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
485485
</script><script type="text/javascript" src="/static/dataTables.bootstrap.js">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ <h4 class="modal-title" id="delete-modal-title">Delete</h4>
311311
</ul>
312312
</p>
313313
</script>
314-
<script type="text/javascript" src="/static/jquery-3.5.1.min.js">
314+
<script type="text/javascript" src="/static/jquery-3.6.0.min.js">
315315
</script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
316316
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
317317
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap-editable.min.js">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</table>
9797
</script>
9898

99-
<script type="text/javascript" src="/static/jquery-3.5.1.min.js"></script>
99+
<script type="text/javascript" src="/static/jquery-3.6.0.min.js"></script>
100100
<script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
101101
<script type="text/javascript" src="/static/moment.min.js"></script>
102102
<script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
{/snn}
8787
</script>
8888

89-
<script type="text/javascript" src="/static/jquery-3.5.1.min.js">
89+
<script type="text/javascript" src="/static/jquery-3.6.0.min.js">
9090
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
9191
</script><script type="text/javascript" src="/static/moment.min.js">
9292
</script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">

hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js

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

hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
<exclude>src/main/resources/webapps/static/dt-1.10.18/js/jquery.dataTables.min.js</exclude>
264264
<exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</exclude>
265265
<exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js</exclude>
266-
<exclude>src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js</exclude>
266+
<exclude>src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js</exclude>
267267
<exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
268268
<exclude>src/test/resources/application_1440536969523_0001.har/_index</exclude>
269269
<exclude>src/test/resources/application_1440536969523_0001.har/part-0</exclude>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected void render(Block html) {
6868
.link(root_url("static/dt-1.10.18/css/jquery.dataTables.css"))
6969
.link(root_url("static/dt-1.10.18/css/jui-dt.css"))
7070
.link(root_url("static/dt-1.10.18/css/custom_datatable.css"))
71-
.script(root_url("static/jquery/jquery-3.5.1.min.js"))
71+
.script(root_url("static/jquery/jquery-3.6.0.min.js"))
7272
.script(root_url("static/jquery/jquery-ui-1.12.1.custom.min.js"))
7373
.script(root_url("static/dt-1.10.18/js/jquery.dataTables.min.js"))
7474
.script(root_url("static/yarn.dt.plugins.js"))

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js

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

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js

Lines changed: 2 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)