You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/19 18:02:08 UTC
[1/2] git commit: updated refs/heads/master to 0827e1f
Repository: cloudstack
Updated Branches:
refs/heads/master 186891962 -> 0827e1f85
Marvin module depends on APIdoc module
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3bedf31d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3bedf31d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3bedf31d
Branch: refs/heads/master
Commit: 3bedf31dca6dc698fd80fcccc4c514df254732ff
Parents: 1868919
Author: Miguel Ferreira <mi...@me.com>
Authored: Mon Oct 19 11:37:07 2015 +0200
Committer: Miguel Ferreira <mi...@me.com>
Committed: Mon Oct 19 13:17:20 2015 +0200
----------------------------------------------------------------------
tools/marvin/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bedf31d/tools/marvin/pom.xml
----------------------------------------------------------------------
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index 5d7396e..bb905b4 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -19,6 +19,16 @@
<version>4.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-apidoc</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+
<build>
<defaultGoal>install</defaultGoal>
<plugins>
[2/2] git commit: updated refs/heads/master to 0827e1f
Posted by re...@apache.org.
Merge pull request #948 from miguelaferreira/marvin-depends-on-apidoc
Marvin module depends on APIdoc moduleWhen building the developer tools, if the build is sequential then the marvin module always gets build after the apidoc module. However, it the build is parallelised (-Tn option in maven) it sometimes happens that maven tries to build the marvin module before building the apidoc module. That difference in the order makes it impossible to build marvin because it depends on the artefacts of the apidoc module.
This PR makes the dependency between marvin an apidoc explicit.
* pr/948:
Marvin module depends on APIdoc module
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0827e1f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0827e1f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0827e1f8
Branch: refs/heads/master
Commit: 0827e1f85050b60b955307323a7e4886b8c21a05
Parents: 1868919 3bedf31
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Oct 19 18:00:33 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Oct 19 18:00:33 2015 +0200
----------------------------------------------------------------------
tools/marvin/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------