This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 752a7b6 HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (#3791)
752a7b6 is described below
commit 752a7b6d498338594eda799153f9004b4a88f31a
Author: luoyuan3471 <[email protected]>
AuthorDate: Wed Jan 12 11:40:32 2022 +0800
HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (#3791)
Co-authored-by: luoyuan <[email protected]>
(cherry picked from commit e2d620192aa0b712d05e4092eb63ef2ccdcd8220)
---
LICENSE-binary | 2 +-
LICENSE.txt | 2 +-
.../hadoop-hdfs-rbf/src/main/webapps/router/explorer.html | 2 +-
.../hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html | 2 +-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html | 2 +-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 2 +-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 2 +-
.../hadoop-hdfs/src/main/webapps/journal/journalnode.html | 2 +-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html | 2 +-
.../hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js | 2 --
.../hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js | 2 ++
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml | 2 +-
.../src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java | 2 +-
.../src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js | 2 --
.../src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js | 2 ++
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 7a712a5..e9b64aa 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -406,7 +406,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.5.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
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
diff --git a/LICENSE.txt b/LICENSE.txt
index efb8745..9db6178 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -243,7 +243,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.5.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
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/moment.min.js
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
index 49c3e66..15f7d7f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
@@ -311,7 +311,7 @@
</ul>
</p>
</script>
- <script type="text/javascript" src="/static/jquery-3.5.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">
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
index 80b4b3b..f985ae5 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
@@ -497,7 +497,7 @@ No nodes are decommissioning.
-<script type="text/javascript" src="static/jquery-3.5.1.min.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>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index df5d2cc..1523fc4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -412,7 +412,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.5.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>
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
index b680f0a..caab81e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
@@ -126,7 +126,7 @@
{/dn.VolumeInfo}
</script>
-<script type="text/javascript" src="/static/jquery-3.5.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>
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
index 69e3495..ad5c30f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
@@ -492,7 +492,7 @@ There are no reported volume failures.
</table>
</script>
-<script type="text/javascript" src="/static/jquery-3.5.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">
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
index 3f0509a..b51a0dd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
@@ -311,7 +311,7 @@
</ul>
</p>
</script>
- <script type="text/javascript" src="/static/jquery-3.5.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">
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/journalnode.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/journalnode.html
index f661c58..0743e94 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/journalnode.html
+++ b/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.5.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>
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
index 41a468d..a3484fb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
+++ b/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.5.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">
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
deleted file mode 100644
index b061403..0000000
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.5.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.5.1 | (c) JS Foundation and other contributors |
jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=
[...]
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
new file mode 100644
index 0000000..200b54e
--- /dev/null
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=
[...]
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
index 63ed238..661b54c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -245,7 +245,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.5.1.min.js</exclude>
+
<exclude>src/main/resources/webapps/static/jquery/jquery-3.6.0.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>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
index 5cf18df..d4e648c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
+++
b/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.5.1.min.js"))
+ .script(root_url("static/jquery/jquery-3.6.0.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"))
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js
deleted file mode 100644
index b061403..0000000
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.5.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.5.1 | (c) JS Foundation and other contributors |
jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=
[...]
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js
new file mode 100644
index 0000000..200b54e
--- /dev/null
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=
[...]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
