Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6278. Enforce to use correct node and npm version in new YARN-UI build. (Sunil G via wangda)

This commit is contained in:
Wangda Tan 2017-03-03 23:43:25 -08:00
parent 0f336bab9c
commit c61bc2d843
3 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
View File

@ -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>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<configuration>
<workingDirectory>${webappTgtDir}</workingDirectory>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<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>bower</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Bower install & grunt build-->
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<phase>generate-sources</phase>
<id>npm install</id>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<workingDirectory>${webappTgtDir}</workingDirectory>
<executable>npm</executable>
<arguments>
<argument>install</argument>
</arguments>
</configuration>
</execution>
<execution>
<phase>generate-sources</phase>
<id>bower install</id>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<workingDirectory>${webappTgtDir}</workingDirectory>
<executable>bower</executable>
<arguments>
<argument>--allow-root</argument>
<argument>install</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>ember build</id>
<phase>generate-sources</phase>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
View File

@ -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",

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
View File

@ -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.7.0",
"broccoli-merge-trees": "1.1.1",
"ember-array-contains-helper": "1.0.2",
"ember-bootstrap": "0.5.1",
"ember-cli": "1.13.13",
"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",
@ -48,8 +51,6 @@
},
"dependencies": {
"em-helpers": "^0.8.0",
"em-table": "^0.7.0",
"ember-cli-moment-shim": "^3.0.1",
"ember-cli-numeral": "^0.2.0"
"em-table": "^0.7.0"
}
}