tidy dist pom how things are attached and the phase so it only runs once
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/56285ad8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/56285ad8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/56285ad8 Branch: refs/heads/master Commit: 56285ad89cc2ba7b9ea540cfb0de25f411d14e29 Parents: 622e03f Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 00:13:59 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 01:04:24 2015 -0700 ---------------------------------------------------------------------- usage/dist/pom.xml | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/56285ad8/usage/dist/pom.xml ---------------------------------------------------------------------- diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml index f4c863c..e226237 100644 --- a/usage/dist/pom.xml +++ b/usage/dist/pom.xml @@ -106,7 +106,7 @@ <executions> <execution> <id>build-distribution-dir</id> - <phase>process-resources</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -125,7 +125,7 @@ </execution> <execution> <id>build-distribution-archive</id> - <phase>process-resources</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals> @@ -134,39 +134,15 @@ <descriptors> <descriptor>src/main/config/build-distribution.xml</descriptor> </descriptors> - <finalName>brooklyn-${project.version}</finalName> + <!-- finalName affects name in `target/` but we cannot influence name when it is attached/installed, + so `apache-` prefix would be lost there. to keep it consistent this is commented out, + but would be nice to have if there is a way! + <finalName>apache-brooklyn-${project.version}</finalName> + --> <formats> <format>tar.gz</format> <format>zip</format> </formats> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-distribution</id> - <phase>process-resources</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/apache-brooklyn-${project.version}-dist.tar.gz</file> - <type>tar.gz</type> - <classifier>dist</classifier> - </artifact> - <artifact> - <file>${project.build.directory}/apache-brooklyn-${project.version}-dist.zip</file> - <type>zip</type> - <classifier>dist</classifier> - </artifact> - </artifacts> </configuration> </execution> </executions>
