From 6827d49b10376790fbeb31b1b6987b644688037d Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 30 Jun 2020 16:52:57 +0900
Subject: [PATCH] YARN-10331. Upgrade node.js to 10.21.0. (#2106)

(cherry picked from commit cd188ea9f0e807df1e2cc13f62be3e4c956b1e69)

 Conflicts:
	dev-support/docker/Dockerfile_aarch64
---
 dev-support/docker/Dockerfile                          | 6 +++---
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index e6ebeb18fb9..9045d9a19c6 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -144,10 +144,10 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 RUN pip3 install pylint==2.6.0 python-dateutil==2.8.1
 
 ###
-# Install node.js 8.17.0 for web UI framework (4.2.6 ships with Xenial)
+# Install node.js 10.21.0 for web UI framework (4.2.6 ships with Xenial)
 ###
-RUN curl -L -s -S https://deb.nodesource.com/setup_8.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs=8.17.0-1nodesource1 \
+RUN curl -L -s -S https://deb.nodesource.com/setup_10.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs=10.21.0-1nodesource1 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && npm install -g bower@1.8.8
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 1abcacf0bee..dea02ed0473 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -143,7 +143,7 @@
                   <goal>install-node-and-yarn</goal>
                 </goals>
                 <configuration>
-                  <nodeVersion>v8.17.0</nodeVersion>
+                  <nodeVersion>v10.21.0</nodeVersion>
                   <yarnVersion>v1.21.1</yarnVersion>
                 </configuration>
               </execution>