Repository: ambari Updated Branches: refs/heads/trunk acdaae986 -> cc4a9a3e0
Revert "AMBARI-10303. Install node / brunch and other build dependencies at build time. Additional patch. (alexantonenko)" This reverts commit 759edd4d37aea54dcaf7056a715f786c26f9f2e8. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce175f16 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce175f16 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce175f16 Branch: refs/heads/trunk Commit: ce175f1688a1f54d8ef1ed9ae4192db5ae644040 Parents: acdaae9 Author: Yusaku Sako <[email protected]> Authored: Wed Apr 1 15:48:55 2015 -0700 Committer: Yusaku Sako <[email protected]> Committed: Wed Apr 1 15:48:55 2015 -0700 ---------------------------------------------------------------------- ambari-web/pom.xml | 58 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ce175f16/ambari-web/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index c6b6c23..65ff47e 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -89,28 +89,16 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.14</version> - <configuration> - <nodeVersion>v0.10.26</nodeVersion> - <npmVersion>1.4.3</npmVersion> - <workingDirectory>${basedir}</workingDirectory> - </configuration> + <version>0.0.19</version> <executions> <execution> <id>install node and npm</id> - <phase>generate-sources</phase> <goals> <goal>install-node-and-npm</goal> </goals> - </execution> - <execution> - <id>npm install</id> - <phase>generate-sources</phase> - <goals> - <goal>npm</goal> - </goals> <configuration> - <arguments>install --unsafe-perm</arguments> + <nodeVersion>v0.10.33</nodeVersion> + <npmVersion>1.4.4</npmVersion> </configuration> </execution> </executions> @@ -129,7 +117,7 @@ <configuration> <executable>${executable.rmdir}</executable> <workingDirectory>${basedir}</workingDirectory> - <commandlineArgs>${args.rm.clean} public node_modules</commandlineArgs> + <commandlineArgs>${args.rm.clean} public node_modules node</commandlineArgs> <successCodes> <successCode>0</successCode> <successCode>1</successCode> @@ -146,7 +134,43 @@ <configuration> <executable>${executable.mkdir}</executable> <workingDirectory>${basedir}</workingDirectory> - <commandlineArgs>${args.mkdir} public</commandlineArgs> + <commandlineArgs>${args.mkdir} public node</commandlineArgs> + </configuration> + </execution> + <execution> + <id>npm-cache-clean</id> + <phase>compile</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${executable.node}</executable> + <workingDirectory>${basedir}</workingDirectory> + <commandlineArgs>${args.npm.full.path} cache clean</commandlineArgs> + </configuration> + </execution> + <execution> + <id>npm-cache-info</id> + <phase>compile</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${executable.node}</executable> + <workingDirectory>${basedir}</workingDirectory> + <commandlineArgs>${args.npm.full.path} cache ls</commandlineArgs> + </configuration> + </execution> + <execution> + <id>install-npm</id> + <phase>compile</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${executable.node}</executable> + <workingDirectory>${basedir}</workingDirectory> + <commandlineArgs>${args.npm.full.path} install</commandlineArgs> </configuration> </execution> <execution>
