Repository: ambari Updated Branches: refs/heads/branch-dev-patch-upgrade 1e89d1d57 -> 718f2ea18
Revert "AMBARI-14936. Tweaks to reduce build time (aonishuk)" This reverts commit dc8e5c3c68d25e74ab875a87f66959fc86a9631c. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/58fe67c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/58fe67c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/58fe67c1 Branch: refs/heads/branch-dev-patch-upgrade Commit: 58fe67c199b9dde7cd0963c9567e728db983def0 Parents: fdb101b Author: Alex Antonenko <[email protected]> Authored: Thu Feb 11 18:14:51 2016 +0200 Committer: Alex Antonenko <[email protected]> Committed: Thu Feb 11 18:17:50 2016 +0200 ---------------------------------------------------------------------- ambari-agent/pom.xml | 40 +++++++++++------------ ambari-server/pom.xml | 6 ++-- ambari-server/src/main/assemblies/server.xml | 2 +- ambari-web/pom.xml | 3 +- pom.xml | 18 +++++++++- 5 files changed, 42 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-agent/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index c2c993f..23d2969 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -86,6 +86,24 @@ <version>3.0</version> </plugin> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <tarLongFileMode>gnu</tarLongFileMode> + <descriptors> + <descriptor>src/packages/tarball/all.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>build-tarball</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -257,24 +275,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <tarLongFileMode>gnu</tarLongFileMode> - <descriptors> - <descriptor>src/packages/tarball/all.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>build-tarball</id> - <phase>${assemblyPhase}</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> <executions> @@ -347,7 +347,7 @@ </execution> <execution> <id>copy-repo-resources</id> - <phase>${assemblyPhase}</phase> + <phase>package</phase> <goals> <goal>copy-resources</goal> </goals> @@ -391,7 +391,7 @@ <executions> <execution> <id>rename-file</id> - <phase>${assemblyPhase}</phase> + <phase>package</phase> <goals> <goal>rename</goal> </goals> http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 51fd88b..5a95ec4 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -134,7 +134,7 @@ <executions> <execution> <id>build-tarball</id> - <phase>${assemblyPhase}</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -173,7 +173,7 @@ </execution> <execution> <id>copy-repo-resources</id> - <phase>${assemblyPhase}</phase> + <phase>package</phase> <goals> <goal>copy-resources</goal> </goals> @@ -217,7 +217,7 @@ <executions> <execution> <id>rename-file</id> - <phase>${assemblyPhase}</phase> + <phase>package</phase> <goals> <goal>rename</goal> </goals> http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-server/src/main/assemblies/server.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml index ca74185..a75de79 100644 --- a/ambari-server/src/main/assemblies/server.xml +++ b/ambari-server/src/main/assemblies/server.xml @@ -301,7 +301,7 @@ </file> <file> <fileMode>755</fileMode> - <source>src/main/resources/stacks/stack_advisor.py</source> + <source>target/classes/stacks/stack_advisor.py</source> <outputDirectory>/var/lib/ambari-server/resources/stacks</outputDirectory> </file> <file> http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/ambari-web/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index 6304b3d..761a3f0 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -32,7 +32,6 @@ <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> @@ -101,7 +100,7 @@ <configuration> <executable>${executable.rmdir}</executable> <workingDirectory>${basedir}</workingDirectory> - <commandlineArgs>${args.rm.clean} public ${nodemodules.dir}</commandlineArgs> + <commandlineArgs>${args.rm.clean} public node_modules</commandlineArgs> <successCodes> <successCode>0</successCode> <successCode>1</successCode> http://git-wip-us.apache.org/repos/asf/ambari/blob/58fe67c1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8f321fd..57c6de7 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,6 @@ <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> @@ -204,6 +203,23 @@ </configuration> </plugin> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>${ambari.dir}/ambari-project/src/main/assemblies/empty.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>rpm-maven-plugin</artifactId> <version>2.0.1</version>
