From 46be0537bf475cbd181cc0c7b407d8ac431458b0 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Tue, 2 Oct 2012 10:18:18 -0700
Subject: [PATCH] Core should not depend on xapi, only the xen and ovm plugin.
 Awsapi needs axis2-adb

---
 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(-)

diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index c3c6c6558bd..88c53ceac4e 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -37,6 +37,11 @@
       <artifactId>axis2</artifactId>
       <version>${cs.axis2.version}</version>
     </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>
diff --git a/core/pom.xml b/core/pom.xml
index ac45233d88d..15f0f7b7302 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>
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index cf52a196584..5700c14d4eb 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>
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
index 8ebe0304042..959c972e080 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>