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/22 11:45:13 UTC
[1/2] git commit: updated refs/heads/master to 4146813
Repository: cloudstack
Updated Branches:
refs/heads/master e7638c028 -> 414681330
cloud-apidoc module depends on cloud-client-ui
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9cbd3210
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9cbd3210
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9cbd3210
Branch: refs/heads/master
Commit: 9cbd32107df56ff398dc4cdf55d28caa4a3b5626
Parents: e7638c0
Author: Miguel Ferreira <mi...@me.com>
Authored: Tue Oct 20 12:32:46 2015 +0200
Committer: Miguel Ferreira <mi...@me.com>
Committed: Thu Oct 22 10:47:34 2015 +0200
----------------------------------------------------------------------
tools/apidoc/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cbd3210/tools/apidoc/pom.xml
----------------------------------------------------------------------
diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index e309bcc..ba4fa3a 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -32,6 +32,12 @@
<artifactId>cloud-server</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-client-ui</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
[2/2] git commit: updated refs/heads/master to 4146813
Posted by re...@apache.org.
Merge pull request #958 from miguelaferreira/cloud-apidoc-depends-on-cloud-client-ui
cloud-apidoc module depends on cloud-client-uiWhen building the cloud-apidoc module a script called `./build-apidoc.sh` is executed with an argument that points to `../../client/target/cloud-client-ui-${project.version}/WEB-INF/lib`. The script uses that argument to build a Java classpath. However, since the cloud-apidoc module does not explicitly depend on cloud-client-ui, a parallel maven build will often fail because the required jars are not present when needed.
Error message when build fails:
```
Error: Could not find or load main class com.cloud.api.doc.ApiXmlDocWriter
```
This PR makes the dependency explicit.
Resulting build:
```
mvn clean install -T4 -Pdeveloper,systemvm
....
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 09:02 min (Wall Clock)
[INFO] Finished at: 2015-10-20T13:31:30+02:00
[INFO] Final Memory: 98M/1526M
[INFO] ------------------------------------------------------------------------
```
* pr/958:
cloud-apidoc module depends on cloud-client-ui
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/41468133
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/41468133
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/41468133
Branch: refs/heads/master
Commit: 414681330916d46853a2f1982bb4412165713e07
Parents: e7638c0 9cbd321
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Oct 22 11:44:28 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Oct 22 11:44:28 2015 +0200
----------------------------------------------------------------------
tools/apidoc/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------