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

YARN-5504. [YARN-3368] Fix YARN UI build pom.xml (Sreenath Somarajapuram via Sunil G)

This commit is contained in:
sunilg 2016-08-25 23:21:29 +05:30 committed by Wangda Tan
parent 666de803ae
commit 7005580752
3 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@
<node.executable>node</node.executable> <node.executable>node</node.executable>
<nodeVersion>v0.12.2</nodeVersion> <nodeVersion>v0.12.2</nodeVersion>
<npmVersion>2.10.0</npmVersion> <npmVersion>2.10.0</npmVersion>
<skipTests>false</skipTests> <keep-ui-build-cache>false</keep-ui-build-cache>
</properties> </properties>
<build> <build>
@ -60,19 +60,20 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version> <version>3.0.0</version>
<configuration> <configuration>
<followSymLinks>false</followSymLinks> <skip>${keep-ui-build-cache}</skip>
<filesets> <followSymLinks>false</followSymLinks>
<fileset> <filesets>
<directory>${basedir}/src/main/webapp/bower_components</directory> <fileset>
</fileset> <directory>${basedir}/src/main/webapp/bower_components</directory>
<fileset> </fileset>
<directory>${basedir}/src/main/webapp/node_modules</directory> <fileset>
</fileset> <directory>${basedir}/src/main/webapp/node_modules</directory>
</filesets> </fileset>
</configuration> </filesets>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -125,21 +126,6 @@
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
<execution>
<phase>generate-sources</phase>
<id>bower --allow-root install</id>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<workingDirectory>${webappDir}</workingDirectory>
<executable>bower</executable>
<arguments>
<argument>--allow-root</argument>
<argument>install</argument>
</arguments>
</configuration>
</execution>
<execution> <execution>
<id>ember build</id> <id>ember build</id>
<phase>generate-sources</phase> <phase>generate-sources</phase>
@ -157,21 +143,6 @@
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>ember test</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<workingDirectory>${webappDir}</workingDirectory>
<executable>ember</executable>
<arguments>
<argument>test</argument>
</arguments>
</configuration>
</execution>
<execution> <execution>
<id>cleanup tmp</id> <id>cleanup tmp</id>
<phase>generate-sources</phase> <phase>generate-sources</phase>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
View File

@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) { module.exports = function(defaults) {
var app = new EmberApp(defaults, { var app = new EmberApp(defaults, {
// Add options here hinting: false
}); });
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css"); app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");

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

@ -9,8 +9,7 @@
}, },
"scripts": { "scripts": {
"build": "ember build", "build": "ember build",
"start": "ember server", "start": "ember server"
"test": "ember test"
}, },
"repository": "", "repository": "",
"engines": { "engines": {