Repository: hadoop Updated Branches: refs/heads/branch-3.0 b7cb58a21 -> dc2ae3f20
YARN-7170. Improve bower dependencies for YARN UI v2. (Sunil G via wangda) (cherry picked from commit 4afd308b62d2335f31064c05bfefaf2294d874b0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dc2ae3f2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dc2ae3f2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dc2ae3f2 Branch: refs/heads/branch-3.0 Commit: dc2ae3f20b777e122afd11b684da65857323287f Parents: b7cb58a Author: Wangda Tan <wan...@apache.org> Authored: Thu Oct 19 21:58:31 2017 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Thu Oct 19 21:59:28 2017 -0700 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc2ae3f2/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 8aa4052..ef5932d 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -137,6 +137,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> http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc2ae3f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml ---------------------------------------------------------------------- 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 42d6018..d292c8e 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> http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc2ae3f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc ---------------------------------------------------------------------- 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 5b0b07d..959e169 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 } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
