Updating dependencies to work on branch-2
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/931ea0cf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/931ea0cf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/931ea0cf Branch: refs/heads/YARN-5355_branch2 Commit: 931ea0cff5896f4d6275ea46a9729491b23289c8 Parents: f8d6ad2 Author: vrushali <vrush...@apache.org> Authored: Tue Oct 10 16:59:38 2017 -0700 Committer: vrushali <vrush...@apache.org> Committed: Tue Oct 17 11:40:01 2017 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 13 +------------ .../hadoop-yarn-ui/src/main/webapp/bower.json | 2 ++ .../hadoop-yarn-ui/src/main/webapp/package.json | 4 ++-- 3 files changed, 5 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/931ea0cf/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 5f546ef..032a9a2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -129,9 +129,6 @@ </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> <!-- Install Node, Yarn, Bower & dependencies --> <plugin> <groupId>com.github.eirslett</groupId> @@ -171,16 +168,8 @@ <arguments>install</arguments> </configuration> <goals> - <goal>exec</goal> + <goal>bower</goal> </goals> - <configuration> - <workingDirectory>${webappTgtDir}</workingDirectory> - <executable>bower</executable> - <arguments> - <argument>--allow-root</argument> - <argument>install</argument> - </arguments> - </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/hadoop/blob/931ea0cf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json index fe5f289..e1ab943 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json @@ -12,6 +12,8 @@ "loader.js": "3.3.0", "qunit": "1.19.0", "jquery-ui": "1.11.4", + "moment": "2.12.0", + "moment-timezone": "0.5.0", "more-js": "0.8.2", "bootstrap": "3.3.6", "d3": "~3.5.6", http://git-wip-us.apache.org/repos/asf/hadoop/blob/931ea0cf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json index 2b454aa..235233c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json @@ -23,7 +23,7 @@ "bower-shrinkwrap-resolver-ext": "0.1.0", "broccoli-asset-rev": "2.4.2", "broccoli-funnel": "1.0.1", - "em-table": "0.7.0", + "broccoli-merge-trees": "1.1.1", "ember-array-contains-helper": "1.0.2", "ember-bootstrap": "0.5.1", "ember-cli": "1.13.14", @@ -55,7 +55,7 @@ "dependencies": { "em-helpers": "^0.8.0", "em-table": "^0.7.0", - "ember-cli-moment-shim": "^3.0.1", + "ember-cli-moment-shim": "0.7.3", "ember-cli-numeral": "^0.2.0" } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
