Updated Branches: refs/heads/master 07af738d3 -> 46be0537b
Core should not depend on xapi, only the xen and ovm plugin. Awsapi needs axis2-adb Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/46be0537 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/46be0537 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/46be0537 Branch: refs/heads/master Commit: 46be0537bf475cbd181cc0c7b407d8ac431458b0 Parents: 07af738 Author: Hugo Trippaers <[email protected]> Authored: Tue Oct 2 10:18:18 2012 -0700 Committer: Hugo Trippaers <[email protected]> Committed: Tue Oct 2 10:19:15 2012 -0700 ---------------------------------------------------------------------- awsapi/pom.xml | 5 +++++ core/pom.xml | 12 +----------- plugins/hypervisors/ovm/pom.xml | 7 +++++++ plugins/hypervisors/xen/pom.xml | 11 +++++++++++ 4 files changed, 24 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/46be0537/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index c3c6c65..88c53ce 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -39,6 +39,11 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> + <artifactId>axis2-adb</artifactId> + <version>${cs.axis2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.axis2</groupId> <artifactId>axis2-webapp</artifactId> <type>war</type> <version>${cs.axis2.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/46be0537/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ac45233..15f0f7b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -31,17 +31,7 @@ <artifactId>cloud-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>xapi</artifactId> - <version>${cs.xapi.version}</version> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/46be0537/plugins/hypervisors/ovm/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index cf52a19..5700c14 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -26,4 +26,11 @@ <version>4.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> + <dependencies> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>xapi</artifactId> + <version>${cs.xapi.version}</version> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/46be0537/plugins/hypervisors/xen/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml index 8ebe030..959c972 100644 --- a/plugins/hypervisors/xen/pom.xml +++ b/plugins/hypervisors/xen/pom.xml @@ -32,5 +32,16 @@ <artifactId>cloud-plugin-network-ovs</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>xapi</artifactId> + <version>${cs.xapi.version}</version> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> </project>
