You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2017/05/26 21:04:10 UTC
[4/6] hadoop git commit: YARN-6278. Enforce to use correct node and
npm version in new YARN-UI build. (Sunil G via wangda)
YARN-6278. Enforce to use correct node and npm version in new YARN-UI build. (Sunil G via wangda)
(cherry picked from commit c61bc2d843ace614078be24b2dcbf3fb43d6f358)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7a51949c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7a51949c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7a51949c
Branch: refs/heads/branch-3.0.0-alpha3
Commit: 7a51949ccc8dc3c67f06dbd83e8d4b45df2c3673
Parents: 413e0a9
Author: Wangda Tan <wa...@apache.org>
Authored: Fri Mar 3 23:43:25 2017 -0800
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue May 23 14:10:30 2017 -0700
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 50 +++++++++++---------
.../hadoop-yarn-ui/src/main/webapp/bower.json | 2 +
.../hadoop-yarn-ui/src/main/webapp/package.json | 12 +++--
3 files changed, 38 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a51949c/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 ea43ced..1eb9b65 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -32,8 +32,8 @@
<packaging.type>pom</packaging.type>
<webappTgtDir>${basedir}/target/src/main/webapp</webappTgtDir>
<node.executable>node</node.executable>
- <nodeVersion>v0.12.2</nodeVersion>
- <npmVersion>2.10.0</npmVersion>
+ <nodeVersion>v4.4.5</nodeVersion>
+ <npmVersion>2.15.5</npmVersion>
<keep-ui-build-cache>false</keep-ui-build-cache>
</properties>
@@ -120,41 +120,47 @@
</executions>
</plugin>
-
- <!-- Bower install & grunt build-->
<plugin>
- <artifactId>exec-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <configuration>
+ <workingDirectory>${webappTgtDir}</workingDirectory>
+ </configuration>
<executions>
<execution>
<phase>generate-sources</phase>
- <id>npm install</id>
+ <id>install node and npm</id>
<goals>
- <goal>exec</goal>
+ <goal>install-node-and-npm</goal>
</goals>
<configuration>
- <workingDirectory>${webappTgtDir}</workingDirectory>
- <executable>npm</executable>
- <arguments>
- <argument>install</argument>
- </arguments>
+ <nodeVersion>${nodeVersion}</nodeVersion>
+ <npmVersion>${npmVersion}</npmVersion>
</configuration>
</execution>
<execution>
<phase>generate-sources</phase>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>generate-sources</phase>
<id>bower install</id>
<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>
+
+
+ <!-- Bower install & grunt build-->
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <executions>
<execution>
<id>ember build</id>
<phase>generate-sources</phase>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a51949c/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/7a51949c/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 6a4eb16..573e505 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
@@ -18,12 +18,13 @@
"author": "",
"license": "Apache",
"devDependencies": {
+ "bower": "1.7.7",
"broccoli-asset-rev": "2.4.2",
"broccoli-funnel": "1.0.1",
- "em-table": "0.1.6",
- "ember-bootstrap": "0.5.1",
+ "broccoli-merge-trees": "1.1.1",
"ember-array-contains-helper": "1.0.2",
- "ember-cli": "1.13.13",
+ "ember-bootstrap": "0.5.1",
+ "ember-cli": "^1.13.13",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "5.1.6",
"ember-cli-content-security-policy": "0.4.0",
@@ -33,6 +34,8 @@
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-inject-live-reload": "1.4.0",
"ember-cli-jquery-ui": "0.0.20",
+ "ember-cli-moment-shim": "0.7.3",
+ "ember-cli-numeral": "^0.2.0",
"ember-cli-qunit": "1.2.1",
"ember-cli-release": "0.2.8",
"ember-cli-sri": "1.2.1",
@@ -47,6 +50,7 @@
"select2": "4.0.0"
},
"dependencies": {
- "em-helpers": "^0.5.13"
+ "em-helpers": "^0.8.0",
+ "em-table": "^0.7.0"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org