[DIST] revert parent updates and move archetype to last built module (currently failing Rat)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/45f1979a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/45f1979a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/45f1979a Branch: refs/heads/master Commit: 45f1979a6a488c33a862e721bf1af982bbdcf57e Parents: b32a37b Author: John McCabe <[email protected]> Authored: Sat Dec 19 19:21:19 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Dec 21 16:43:39 2015 +0000 ---------------------------------------------------------------------- brooklyn-dist/archetypes/quickstart/pom.xml | 4 ++-- brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml | 1 - brooklyn-dist/pom.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/45f1979a/brooklyn-dist/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/pom.xml b/brooklyn-dist/archetypes/quickstart/pom.xml index 39adbdd..7154f76 100644 --- a/brooklyn-dist/archetypes/quickstart/pom.xml +++ b/brooklyn-dist/archetypes/quickstart/pom.xml @@ -30,9 +30,9 @@ <parent> <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-dist-root</artifactId> + <artifactId>brooklyn-parent</artifactId> <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../../brooklyn-server/parent/pom.xml</relativePath> </parent> <build> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/45f1979a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml index d1559a8..f879498 100644 --- a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml +++ b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml @@ -8,7 +8,6 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-downstream-parent</artifactId> <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> - <relativePath>../../../../downstream-parent/pom.xml</relativePath> </parent> <groupId>com.acme.sample</groupId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/45f1979a/brooklyn-dist/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/pom.xml b/brooklyn-dist/pom.xml index 904a20e..652738c 100644 --- a/brooklyn-dist/pom.xml +++ b/brooklyn-dist/pom.xml @@ -74,9 +74,9 @@ <modules> <module>downstream-parent</module> - <module>archetypes/quickstart</module> <module>all</module> <module>dist</module> + <module>archetypes/quickstart</module> </modules> </project>
