Core should not depend on xapi, only the xen and ovm plugin.

Awsapi needs axis2-adb

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>

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>

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>

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>