You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2015/07/15 12:03:49 UTC
[15/15] incubator-brooklyn git commit: Rely on project order instead
of dependency
Rely on project order instead of dependency
Backport of fix on master by Hadrian Zbarcea <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a554e918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a554e918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a554e918
Branch: refs/heads/0.7.0-incubating
Commit: a554e9188e048131d8c33097c23604489ad58ddc
Parents: 8fa4c3d
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Mon Jul 13 17:37:06 2015 -0400
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
usage/archetypes/quickstart/pom.xml | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a554e918/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae39c02..69f25b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
<modules>
<module>parent</module>
+ <module>usage/downstream-parent</module>
<module>api</module>
<module>camp</module>
@@ -115,7 +116,6 @@
<module>usage/camp</module>
<module>usage/cli</module>
<module>usage/dist</module>
- <module>usage/downstream-parent</module>
<module>usage/jsgui</module>
<module>usage/launcher</module>
<module>usage/logback-includes</module>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a554e918/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index 6440581..d7217b2 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -35,15 +35,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-downstream-parent</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>