YARN-7170. Improve bower dependencies for YARN UI v2. (Sunil G via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bc2326f5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bc2326f5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bc2326f5 Branch: refs/heads/YARN-3368_branch2 Commit: bc2326f5f081e854be8d8a1519cfef10aff78323 Parents: 28c5498 Author: Wangda Tan <[email protected]> Authored: Thu Oct 19 21:58:31 2017 -0700 Committer: vrushali <[email protected]> Committed: Thu Oct 19 22:20:36 2017 -0700 ---------------------------------------------------------------------- hadoop-project/pom.xml | 4 ++++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 2 +- .../hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc | 5 +---- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc2326f5/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 575a9c4..2c8f4a9 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -132,6 +132,10 @@ <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> </properties> <dependencyManagement> http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc2326f5/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 032a9a2..c604af7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -133,7 +133,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/bc2326f5/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: [email protected] For additional commands, e-mail: [email protected]
