From 9cb535caf234c315270903bde0d34d1bcd8bba52 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <akiraaj@amazon.com>
Date: Fri, 28 Jan 2022 15:51:21 +0900
Subject: [PATCH] YARN-10561. Upgrade node.js to 12.22.1 and yarn to 1.22.5 in
 YARN application catalog webapp (#2591)

Reviewed-by: Masatake Iwasaki <iwasakims@apache.org>
---
 hadoop-project/pom.xml                                        | 2 ++
 .../hadoop-yarn-applications-catalog-webapp/pom.xml           | 4 ++--
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml        | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 294e0bbf3d0..71a2a3b90f8 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -214,6 +214,8 @@
     <woodstox.version>5.3.0</woodstox.version>
     <json-smart.version>2.4.7</json-smart.version>
     <nimbus-jose-jwt.version>9.8.1</nimbus-jose-jwt.version>
+    <nodejs.version>v12.22.1</nodejs.version>
+    <yarnpkg.version>v1.22.5</yarnpkg.version>
     <apache-ant.version>1.10.11</apache-ant.version>
   </properties>
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
index cbcd13abb95..bae498cfb4a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
@@ -299,8 +299,8 @@
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <nodeVersion>v8.11.3</nodeVersion>
-                            <yarnVersion>v1.7.0</yarnVersion>
+                            <nodeVersion>${nodejs.version}</nodeVersion>
+                            <yarnVersion>${yarnpkg.version}</yarnVersion>
                         </configuration>
                     </execution>
                     <execution>
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 d8be4c76673..ca291ec85d1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -184,8 +184,8 @@
                   <goal>install-node-and-yarn</goal>
                 </goals>
                 <configuration>
-                  <nodeVersion>v12.22.1</nodeVersion>
-                  <yarnVersion>v1.22.5</yarnVersion>
+                  <nodeVersion>${nodejs.version}</nodeVersion>
+                  <yarnVersion>${yarnpkg.version}</yarnVersion>
                 </configuration>
               </execution>
               <execution>