YARN-5504. [YARN-3368] Fix YARN UI build pom.xml (Sreenath Somarajapuram via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ade1dd96 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ade1dd96 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ade1dd96 Branch: refs/heads/YARN-3368_branch2 Commit: ade1dd96b562ddb75c4f432bd2ba8828844f2995 Parents: 1510fea Author: sunilg <sun...@apache.org> Authored: Thu Aug 25 23:21:29 2016 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Wed Oct 18 02:06:47 2017 +0530 ---------------------------------------------------------------------- .../hadoop-yarn/hadoop-yarn-ui/pom.xml | 59 +++++--------------- .../src/main/webapp/ember-cli-build.js | 2 +- .../hadoop-yarn-ui/src/main/webapp/package.json | 3 +- 3 files changed, 17 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/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 7dcc42e..8162bdd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -35,7 +35,7 @@ <node.executable>node</node.executable> <nodeVersion>v0.12.2</nodeVersion> <npmVersion>2.10.0</npmVersion> - <skipTests>false</skipTests> + <keep-ui-build-cache>false</keep-ui-build-cache> </properties> <build> @@ -60,19 +60,20 @@ </plugin> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <followSymLinks>false</followSymLinks> - <filesets> - <fileset> - <directory>${basedir}/src/main/webapp/bower_components</directory> - </fileset> - <fileset> - <directory>${basedir}/src/main/webapp/node_modules</directory> - </fileset> - </filesets> - </configuration> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <skip>${keep-ui-build-cache}</skip> + <followSymLinks>false</followSymLinks> + <filesets> + <fileset> + <directory>${basedir}/src/main/webapp/bower_components</directory> + </fileset> + <fileset> + <directory>${basedir}/src/main/webapp/node_modules</directory> + </fileset> + </filesets> + </configuration> </plugin> </plugins> </build> @@ -126,21 +127,6 @@ </configuration> </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> <id>ember build</id> <phase>generate-sources</phase> <goals> @@ -158,21 +144,6 @@ </configuration> </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> <id>cleanup tmp</id> <phase>generate-sources</phase> <goals> http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js index d21cc3e..7736c75 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js @@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); module.exports = function(defaults) { var app = new EmberApp(defaults, { - // Add options here + hinting: false }); app.import("bower_components/datatables/media/css/jquery.dataTables.min.css"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/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 baa473a..6a4eb16 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 @@ -9,8 +9,7 @@ }, "scripts": { "build": "ember build", - "start": "ember server", - "test": "ember test" + "start": "ember server" }, "repository": "", "engines": { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
