remove intermediate parent poms

wolfhml · Aug 27, 2012 · a06ed57 · a06ed57
1 parent 0d7601d
commit a06ed57
Show file tree

Hide file tree

Showing 33 changed files with 101 additions and 180 deletions.
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Agents</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/api/pom.xml b/api/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack API</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/awsapi/pom.xml b/awsapi/pom.xml
@@ -24,9 +24,8 @@
   <name>Apache CloudStack AWS API Bridge</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Console Proxy</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -23,9 +23,8 @@
   <name>Apache CloudStack Core</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-parent</artifactId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
@@ -20,14 +20,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>cloud-parent</artifactId>
     <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>xapi</artifactId>
   <version>5.6.100-1-SNAPSHOT</version>
-  <name>XenSource XAPI</name>
+  <name>Apache XenSource XAPI</name>
   <description>XenSource XAPI Java Bindings</description>
   <dependencies>
     <dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Concentrated Pod Deployment Planner</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - User Dispersing Deployment Planner</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - NetApp File System</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Host Allocator Random</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Hypervisor KVM</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Hypervisor OracleVM</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Hypervisor VMware</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Hypervisor Xen</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Network Elastic Load Balancer</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - F5</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Juniper SRX</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/network-elements/midokura-midonet/pom.xml b/plugins/network-elements/midokura-midonet/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Midokura Midonet</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
@@ -23,9 +23,9 @@
   <name>Apache CloudStack Plugin - Network Netscaler</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>

diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Network Nicira NVP</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
@@ -23,8 +23,8 @@
   <name>Apache CloudStack Plugin - Open vSwitch</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloud-plugin-parent</artifactId>
+    <artifactId>cloud-plugins</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 </project>
diff --git a/plugins/parent/pom.xml b/plugins/parent/pom.xml
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -24,16 +24,14 @@
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.apache.cloudstack</groupId>
-		<artifactId>cloud-parent</artifactId>
+		<artifactId>cloudstack</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<build>
 		<defaultGoal>install</defaultGoal>
 		<sourceDirectory>src</sourceDirectory>
 	</build>
 	<modules>
-		<module>parent</module>
 		<module>deployment-planners/user-concentrated-pod</module>
 		<module>deployment-planners/user-dispersing</module>
 		<module>file-systems/netapp</module>
@@ -54,4 +52,13 @@
 		<module>user-authenticators/md5</module>
 		<module>user-authenticators/plain-text</module>
 	</modules>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
 </project>