From 4afd308b62d2335f31064c05bfefaf2294d874b0 Mon Sep 17 00:00:00 2001
From: Wangda Tan <wangda@apache.org>
Date: Thu, 19 Oct 2017 21:58:31 -0700
Subject: [PATCH] YARN-7170. Improve bower dependencies for YARN UI v2. (Sunil
 G via wangda)

---
 hadoop-project/pom.xml                                       | 1 +
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml       | 2 +-
 .../hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc      | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 8980f0efe7..3baa8f3f77 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -138,6 +138,7 @@
     <surefire.fork.timeout>900</surefire.fork.timeout>
     <aws-java-sdk.version>1.11.199</aws-java-sdk.version>
     <hsqldb.version>2.3.4</hsqldb.version>
+    <frontend-maven-plugin.version>1.5</frontend-maven-plugin.version>
     <!-- the version of Hadoop declared in the version resources; can be overridden
     so that Hadoop 3.x can declare itself a 2.x artifact. -->
     <declared.hadoop.version>${project.version}</declared.hadoop.version>
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 7aa03edfd4..b552f35cfe 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.2</version>
+            <version>${frontend-maven-plugin.version}</version>
             <configuration>
               <workingDirectory>${webappDir}</workingDirectory>
             </configuration>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
index 5b0b07d756..959e1696e7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
@@ -1,7 +1,4 @@
 {
   "directory": "bower_components",
-  "analytics": false,
-  "resolvers": [
-    "bower-shrinkwrap-resolver-ext"
-  ]
+  "analytics": false
 }