Skip to content

ODP-2215 | Backported YARN-11092 | YARN-11303 | HADOOP-18044 upgraded jquery #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 11, 2024
Merged

ODP-2215 | Backported YARN-11092 | YARN-11303 | HADOOP-18044 upgraded jquery #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
726fa2a
YARN-11092. Upgrade jquery ui to 1.13.1 (#4260)
hotcodemacha May 16, 2022
3342098
ODP-2215 - importing com.google.common.collect.Lists
senthh Sep 11, 2024
6bed3ed
YARN-11303. Upgrade jquery ui to 1.13.2 to mitigate CVE-2022-31160 (#…
hotcodemacha Oct 5, 2022
953c3d6
HADOOP-18044. Hadoop - Upgrade to jQuery 3.6.0 (#3791)
luoyuan3471 Jan 12, 2022
55ae615
ODP-2215 - Deleting jquery-3.3.1.min.js
senthh Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added LICENSE-binary
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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
Expand Down
Empty file added hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/explorer.html
View file
Open in desktop
Empty file.
17 changes: 9 additions & 8 deletions hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion hadoop-hdfs-project/hadoop-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Empty file added hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/journalnode.html
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 2 additions & 0 deletions hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.6.0.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@
<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/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>
<exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.13.2.custom.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>
Expand Down
20 changes: 11 additions & 9 deletions ...op-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/JQueryUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@

package org.apache.hadoop.yarn.webapp.view;

import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
import static org.apache.hadoop.yarn.util.StringHelper.djoin;
import static org.apache.hadoop.yarn.util.StringHelper.join;
import static org.apache.hadoop.yarn.util.StringHelper.split;

import java.util.List;

import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.yarn.webapp.hamlet2.HamletSpec.HTML;

import com.google.common.collect.Lists;

import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
import static org.apache.hadoop.yarn.util.StringHelper.djoin;
import static org.apache.hadoop.yarn.util.StringHelper.join;
import static org.apache.hadoop.yarn.util.StringHelper.split;

@InterfaceAudience.LimitedPrivate({"YARN", "MapReduce"})
public class JQueryUI extends HtmlBlock {

Expand Down Expand Up @@ -66,10 +66,12 @@ 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"))
.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"))
.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.6.0.min.js"))
.script(root_url("static/jquery/jquery-ui-1.13.2.custom.min.js"))
.script(root_url("static/dt-1.10.18/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; }",
Expand Down
2 changes: 0 additions & 2 deletions ...doop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.3.1.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions ...doop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-3.6.0.min.js
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions ...adoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.12.1.custom.min.js
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions ...adoop-yarn-common/src/main/resources/webapps/static/jquery/jquery-ui-1.13.2.custom.min.js
View file
Open in desktop

Large diffs are not rendered by default.