AMBARI-14936. Tweaks to reduce build time (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77daca7a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77daca7a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77daca7a Branch: refs/heads/branch-dev-patch-upgrade Commit: 77daca7a62abb3f6caa8f4be349aee704a1d7267 Parents: ddba3c5 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Fri Feb 12 16:17:36 2016 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Fri Feb 12 16:17:36 2016 +0200 ---------------------------------------------------------------------- ambari-agent/pom.xml | 6 +++--- ambari-server/pom.xml | 6 +++--- ambari-web/pom.xml | 3 ++- pom.xml | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/ambari-agent/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index bb7cc34..c2c993f 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -267,7 +267,7 @@ <executions> <execution> <id>build-tarball</id> - <phase>package</phase> + <phase>${assemblyPhase}</phase> <goals> <goal>single</goal> </goals> @@ -347,7 +347,7 @@ </execution> <execution> <id>copy-repo-resources</id> - <phase>package</phase> + <phase>${assemblyPhase}</phase> <goals> <goal>copy-resources</goal> </goals> @@ -391,7 +391,7 @@ <executions> <execution> <id>rename-file</id> - <phase>package</phase> + <phase>${assemblyPhase}</phase> <goals> <goal>rename</goal> </goals> http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 33b5501..b0794c9 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -134,7 +134,7 @@ <executions> <execution> <id>build-tarball</id> - <phase>package</phase> + <phase>${assemblyPhase}</phase> <goals> <goal>single</goal> </goals> @@ -173,7 +173,7 @@ </execution> <execution> <id>copy-repo-resources</id> - <phase>package</phase> + <phase>${assemblyPhase}</phase> <goals> <goal>copy-resources</goal> </goals> @@ -217,7 +217,7 @@ <executions> <execution> <id>rename-file</id> - <phase>package</phase> + <phase>${assemblyPhase}</phase> <goals> <goal>rename</goal> </goals> http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/ambari-web/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index 761a3f0..6304b3d 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -32,6 +32,7 @@ <properties> <ambari.dir>${project.parent.parent.basedir}</ambari.dir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <nodemodules.dir>node_modules</nodemodules.dir> <!-- specify -Dnodemodules.dir option to reduce ambari-web build time by not re-downloading npm modules --> </properties> <build> <plugins> @@ -100,7 +101,7 @@ <configuration> <executable>${executable.rmdir}</executable> <workingDirectory>${basedir}</workingDirectory> - <commandlineArgs>${args.rm.clean} public node_modules</commandlineArgs> + <commandlineArgs>${args.rm.clean} public ${nodemodules.dir}</commandlineArgs> <successCodes> <successCode>0</successCode> <successCode>1</successCode> http://git-wip-us.apache.org/repos/asf/ambari/blob/77daca7a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57c6de7..cf9993b 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,7 @@ <distMgmtStagingId>apache.staging.https</distMgmtStagingId> <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName> <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl> + <assemblyPhase>package</assemblyPhase> <!-- use -DassemblyPhase=none to skip building tarball, useful when you want purely compile jar --> </properties> <pluginRepositories> <pluginRepository>