From 99d8133968f997ed3d3c5434e8c442edcf184671 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 6 Jan 2021 12:12:46 +0900
Subject: [PATCH] YARN-10560. Upgrade node.js to 10.23.1 and yarn to 1.22.5 in
 Web UI v2. (#2592)

(cherry picked from commit ae4945fb2c89397f81e7d0566784e6548b6de685)

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

diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 9045d9a19c6..0d4a8f9446b 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -153,12 +153,12 @@ RUN curl -L -s -S https://deb.nodesource.com/setup_10.x | bash - \
     && npm install -g bower@1.8.8
 
 ###
-## Install Yarn 1.12.1 for web UI framework
+## Install Yarn 1.22.5 for web UI framework
 ####
 RUN curl -s -S https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
     && apt-get -q update \
-    && apt-get install -y --no-install-recommends yarn=1.12.1-1 \
+    && apt-get install -y --no-install-recommends yarn=1.22.5-1 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
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 dea02ed0473..fed1e5c994a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -143,8 +143,8 @@
                   <goal>install-node-and-yarn</goal>
                 </goals>
                 <configuration>
-                  <nodeVersion>v10.21.0</nodeVersion>
-                  <yarnVersion>v1.21.1</yarnVersion>
+                  <nodeVersion>v10.23.1</nodeVersion>
+                  <yarnVersion>v1.22.5</yarnVersion>
                 </configuration>
               </execution>
               <execution>