remove intermediate parent poms

This commit is contained in:
olivier lamy 2012-08-27 16:43:24 +02:00
parent 0d7601d2d7
commit a06ed5728c
33 changed files with 101 additions and 180 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -1,75 +0,0 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-parent</artifactId>
<packaging>pom</packaging>
<name>Apache CloudStack Parent</name>
<description>Apache CloudStack Parent POM</description>
<properties>
<cs.log4j.version>1.2.16</cs.log4j.version>
<cs.log4j.extras.version>1.1</cs.log4j.extras.version>
<cs.cglib.version>2.2.2</cs.cglib.version>
<cs.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.6</cs.codec.version>
<cs.configuration.version>1.8</cs.configuration.version>
<cs.ejb.version>3.0</cs.ejb.version>
<cs.junit.version>4.10</cs.junit.version>
<cs.bcprov.version>1.46</cs.bcprov.version>
<cs.jsch.version>0.1.42</cs.jsch.version>
<cs.jpa.version>1.0.0.Final</cs.jpa.version>
<cs.jasypt.version>1.9.0</cs.jasypt.version>
<cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
<cs.ehcache.version>1.5.0</cs.ehcache.version>
<cs.gson.version>1.7.1</cs.gson.version>
<cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
<cs.httpclient.version>3.1</cs.httpclient.version>
<cs.httpcore.version>4.0</cs.httpcore.version>
<cs.mysql.version>5.1.12</cs.mysql.version>
<cs.xstream.version>1.3.1</cs.xstream.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.mail.version>1.4</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version>
<cs.axis2.version>1.5.1</cs.axis2.version>
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.servlet.version>2.4</cs.servlet.version>
<skipTests>true</skipTests>
</properties>
<build>
<defaultGoal>install</defaultGoal>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${cs.junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -1,42 +0,0 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<artifactId>cloud-plugin-parent</artifactId>
<name>Apache CloudStack Plugin POM</name>
<packaging>pom</packaging>
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-server</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
</build>
</project>

View File

@ -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>

View File

@ -23,8 +23,8 @@
<name>Apache CloudStack Plugin - Storage Allocator Random</name>
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-parent</artifactId>
<artifactId>cloudstack</artifactId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>

View File

@ -23,8 +23,8 @@
<name>Apache CloudStack Plugin - User Authenticator LDAP</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>

View File

@ -23,8 +23,8 @@
<name>Apache CloudStack Plugin - User Authenticator MD5</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>

View File

@ -23,8 +23,8 @@
<name>Apache CloudStack Plugin - User Authenticator Plain Text</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>

42
pom.xml
View File

@ -45,6 +45,38 @@
<properties>
<cs.jdk.version>1.6</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cs.log4j.version>1.2.16</cs.log4j.version>
<cs.log4j.extras.version>1.1</cs.log4j.extras.version>
<cs.cglib.version>2.2.2</cs.cglib.version>
<cs.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.6</cs.codec.version>
<cs.configuration.version>1.8</cs.configuration.version>
<cs.ejb.version>3.0</cs.ejb.version>
<cs.junit.version>4.10</cs.junit.version>
<cs.bcprov.version>1.46</cs.bcprov.version>
<cs.jsch.version>0.1.42</cs.jsch.version>
<cs.jpa.version>1.0.0.Final</cs.jpa.version>
<cs.jasypt.version>1.9.0</cs.jasypt.version>
<cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
<cs.ehcache.version>1.5.0</cs.ehcache.version>
<cs.gson.version>1.7.1</cs.gson.version>
<cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
<cs.httpclient.version>3.1</cs.httpclient.version>
<cs.httpcore.version>4.0</cs.httpcore.version>
<cs.mysql.version>5.1.12</cs.mysql.version>
<cs.xstream.version>1.3.1</cs.xstream.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.mail.version>1.4</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version>
<cs.axis2.version>1.5.1</cs.axis2.version>
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.servlet.version>2.4</cs.servlet.version>
<skipTests>true</skipTests>
</properties>
<distributionManagement>
@ -109,7 +141,6 @@
</organization>
<modules>
<module>parent</module>
<module>api</module>
<module>agent</module>
<module>console-proxy</module>
@ -123,6 +154,15 @@
<module>awsapi</module>
</modules>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${cs.junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
<pluginManagement>

View File

@ -23,9 +23,8 @@
<name>Apache CloudStack Server</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>

View File

@ -23,9 +23,8 @@
<name>Apache CloudStack Usage Server</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>

View File

@ -23,9 +23,8 @@
<name>Apache CloudStack Utils</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>

View File

@ -23,9 +23,8 @@
<name>Apache CloudStack VMware Base</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>