diff --git a/agent/pom.xml b/agent/pom.xml index 1db03165747..a569a7dc329 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -17,52 +17,52 @@ under the License. --> - 4.0.0 - cloud-agent - Apache CloudStack Agents - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - com.cloud - cloud-core - ${project.version} - - - org.mortbay.jetty - jetty - 6.1.26 - - - com.cloud - cloud-utils - ${project.version} - tests - test - - - - install - src - test - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - test-jar - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-agent + Apache CloudStack Agents + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + com.cloud + cloud-core + ${project.version} + + + org.mortbay.jetty + jetty + 6.1.26 + + + com.cloud + cloud-utils + ${project.version} + tests + test + + + + install + src + test + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + test-jar + + + + + + diff --git a/api/pom.xml b/api/pom.xml index c2ffa814111..f0ba16d3bfc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -17,30 +17,30 @@ under the License. --> - 4.0.0 - cloud-api - Apache CloudStack API - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - com.cloud - cloud-utils - ${project.version} - - - com.google.code.gson - gson - ${cs.gson.version} - - - - install - src - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-api + Apache CloudStack API + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + com.cloud + cloud-utils + ${project.version} + + + com.google.code.gson + gson + ${cs.gson.version} + + + + install + src + diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 2555d9f2b88..045a62a17ae 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -17,99 +17,99 @@ under the License. --> - 4.0.0 - cloud-awsapi - 4.0.0-SNAPSHOT - Apache CloudStack AWS API Bridge - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-awsapi + 4.0.0-SNAPSHOT + Apache CloudStack AWS API Bridge + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT ../parent/pom.xml - - + + org.apache.axis2 axis2 ${cs.axis2.version} - - org.apache.ws.commons.axiom - axiom-api - ${cs.axiom.version} - - - org.hibernate - hibernate-core - ${cs.hibernate.version} - - - org.hibernate - hibernate-annotations - ${cs.hibernate.version} - - - org.hibernate - hibernate-entitymanager - ${cs.hibernate.version} - - - log4j - log4j - ${cs.log4j.version} - - - org.apache.neethi - neethi - ${cs.neethi.version} - - -com.google.code.gson -gson -${cs.gson.version} - - -commons-codec -commons-codec -${cs.codec.version} - - - javax.servlet - servlet-api - ${cs.servlet.version} - provided - - - com.googlecode.json-simple - json-simple - 1.1 - - -org.jasypt -jasypt -${cs.jasypt.version} - - - - install - src - - + + org.apache.ws.commons.axiom + axiom-api + ${cs.axiom.version} + + + org.hibernate + hibernate-core + ${cs.hibernate.version} + + + org.hibernate + hibernate-annotations + ${cs.hibernate.version} + + + org.hibernate + hibernate-entitymanager + ${cs.hibernate.version} + + + log4j + log4j + ${cs.log4j.version} + + + org.apache.neethi + neethi + ${cs.neethi.version} + + + com.google.code.gson + gson + ${cs.gson.version} + + + commons-codec + commons-codec + ${cs.codec.version} + + + javax.servlet + servlet-api + ${cs.servlet.version} + provided + + + com.googlecode.json-simple + json-simple + 1.1 + + + org.jasypt + jasypt + ${cs.jasypt.version} + + + + install + src + + diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 5dca6e7ec21..31f4e31e813 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -17,35 +17,35 @@ under the License. --> - 4.0.0 - cloud-console-proxy - Apache CloudStack Console Proxy - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - log4j - log4j - ${cs.log4j.version} - - - com.google.code.gson - gson - ${cs.gson.version} - - - commons-codec - commons-codec - ${cs.codec.version} - - - - install - src - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-console-proxy + Apache CloudStack Console Proxy + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + log4j + log4j + ${cs.log4j.version} + + + com.google.code.gson + gson + ${cs.gson.version} + + + commons-codec + commons-codec + ${cs.codec.version} + + + + install + src + diff --git a/core/pom.xml b/core/pom.xml index 2ea1cc6f888..ec410887872 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -17,48 +17,48 @@ under the License. --> - 4.0.0 - cloud-core - Apache CloudStack Core - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - com.cloud - cloud-api - ${project.version} - - - com.cloud - xapi - ${cs.xapi.version} - - - junit - junit - - - - - commons-httpclient - commons-httpclient - ${cs.httpclient.version} - - - commons-codec - commons-codec - - - - - - install - src - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-core + Apache CloudStack Core + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + com.cloud + cloud-api + ${project.version} + + + com.cloud + xapi + ${cs.xapi.version} + + + junit + junit + + + + + commons-httpclient + commons-httpclient + ${cs.httpclient.version} + + + commons-codec + commons-codec + + + + + + install + src + + diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml index f60f1c8ef66..1debfd6fd25 100644 --- a/deps/XenServerJava/pom.xml +++ b/deps/XenServerJava/pom.xml @@ -17,27 +17,27 @@ under the License. --> - 4.0.0 - - cloud-parent - com.cloud - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - xapi - 5.6.100-1-SNAPSHOT - XenSource XAPI - XenSource XAPI Java Bindings - - - org.apache.xmlrpc - xmlrpc-client - ${cs.xmlrpc.version} - - - - src - install - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + cloud-parent + com.cloud + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + xapi + 5.6.100-1-SNAPSHOT + XenSource XAPI + XenSource XAPI Java Bindings + + + org.apache.xmlrpc + xmlrpc-client + ${cs.xmlrpc.version} + + + + src + install + diff --git a/parent/pom.xml b/parent/pom.xml index 9564572b75e..1f938d7d813 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -17,70 +17,70 @@ under the License. --> - - com.cloud - cloudstack - 4.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - cloud-parent - pom - Apache CloudStack Parent - Apache CloudStack Parent POM - - 1.2.16 - 1.1 - 2.2.2 - 1.4 - 1.6 - 1.6 - 1.8 - 3.0 - 4.10 - 1.46 - 0.1.42 - 1.0.0.Final - 1.9.0 - build213-svnkit-1.3-patch - 1.5.0 - 1.7.1 - 5.6.100-1-SNAPSHOT - 3.1 - 4.0 - 5.1.12 - 1.3.1 - 3.1.3 - 1.4 - 1.4 - 1.5.1 - 1.2.8 - 3.5.1-Final - 2.0.4 - 2.4 - true - - - install - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - ${cs.jdk.version} - ${cs.jdk.version} - - - - - - - junit - junit - ${cs.junit.version} - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + com.cloud + cloudstack + 4.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 + cloud-parent + pom + Apache CloudStack Parent + Apache CloudStack Parent POM + + 1.2.16 + 1.1 + 2.2.2 + 1.4 + 1.6 + 1.6 + 1.8 + 3.0 + 4.10 + 1.46 + 0.1.42 + 1.0.0.Final + 1.9.0 + build213-svnkit-1.3-patch + 1.5.0 + 1.7.1 + 5.6.100-1-SNAPSHOT + 3.1 + 4.0 + 5.1.12 + 1.3.1 + 3.1.3 + 1.4 + 1.4 + 1.5.1 + 1.2.8 + 3.5.1-Final + 2.0.4 + 2.4 + true + + + install + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + ${cs.jdk.version} + ${cs.jdk.version} + + + + + + + junit + junit + ${cs.junit.version} + test + + diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml index 682ac05f167..a643cf9f8aa 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-planner-user-concentrated-pod - Apache CloudStack Plugin - User Concentrated Pod Deployment Planner - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-planner-user-concentrated-pod + Apache CloudStack Plugin - User Concentrated Pod Deployment Planner + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml index 247479a206c..d4d7095a78c 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-planner-user-dispersing - Apache CloudStack Plugin - User Dispersing Deployment Planner - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-planner-user-dispersing + Apache CloudStack Plugin - User Dispersing Deployment Planner + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml index 9a59d163a4a..a5f024d48d3 100644 --- a/plugins/file-systems/netapp/pom.xml +++ b/plugins/file-systems/netapp/pom.xml @@ -17,21 +17,21 @@ under the License. --> - 4.0.0 - cloud-plugin-netapp - Apache CloudStack Plugin - NetApp File System - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud.com.netapp - manageontap - 1.0 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-netapp + Apache CloudStack Plugin - NetApp File System + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud.com.netapp + manageontap + 1.0 + + diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index 478e2733106..85d125bdf23 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-host-allocator-random - Apache CloudStack Plugin - Host Allocator Random - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-host-allocator-random + Apache CloudStack Plugin - Host Allocator Random + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 149b57a1b9a..d01a2b20c7b 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -17,26 +17,26 @@ under the License. --> - 4.0.0 - cloud-plugin-hypervisor-kvm - Apache CloudStack Plugin - Hypervisor KVM - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud - cloud-agent - ${project.version} - - - org.libvirt - libvirt - 0.4.8 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-hypervisor-kvm + Apache CloudStack Plugin - Hypervisor KVM + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud + cloud-agent + ${project.version} + + + org.libvirt + libvirt + 0.4.8 + + diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index 28dfcd13885..cc480d7fae4 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-hypervisor-ovm - Apache CloudStack Plugin - Hypervisor OracleVM - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-hypervisor-ovm + Apache CloudStack Plugin - Hypervisor OracleVM + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 5869fba7860..f9f681ee03a 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -17,21 +17,21 @@ under the License. --> - 4.0.0 - cloud-plugin-hypervisor-vmware - Apache CloudStack Plugin - Hypervisor VMware - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud - cloud-vmware-base - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-hypervisor-vmware + Apache CloudStack Plugin - Hypervisor VMware + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud + cloud-vmware-base + ${project.version} + + diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml index 7c384c71865..13ebeb5668b 100644 --- a/plugins/hypervisors/xen/pom.xml +++ b/plugins/hypervisors/xen/pom.xml @@ -17,21 +17,21 @@ under the License. --> - 4.0.0 - cloud-plugin-hypervisor-xen - Apache CloudStack Plugin - Hypervisor Xen - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud - cloud-plugin-network-ovs - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-hypervisor-xen + Apache CloudStack Plugin - Hypervisor Xen + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud + cloud-plugin-network-ovs + ${project.version} + + diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml index c4a81216c76..a50ad339add 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-network-elb - Apache CloudStack Plugin - Network Elastic Load Balancer - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-elb + Apache CloudStack Plugin - Network Elastic Load Balancer + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index f135efa8f38..57e4ea53b8b 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -17,26 +17,26 @@ under the License. --> - 4.0.0 - cloud-plugin-network-f5 - Apache CloudStack Plugin - F5 - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud.com.f5 - icontrol - 1.0 - - - org.apache.axis - axis - ${cs.axis.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-f5 + Apache CloudStack Plugin - F5 + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud.com.f5 + icontrol + 1.0 + + + org.apache.axis + axis + ${cs.axis.version} + + diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index 6854e506fe8..d6c907f7b42 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -17,26 +17,26 @@ under the License. --> - 4.0.0 - cloud-plugin-network-srx - Apache CloudStack Plugin - Juniper SRX - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud.com.f5 - icontrol - 1.0 - - - org.apache.axis - axis - ${cs.axis.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-srx + Apache CloudStack Plugin - Juniper SRX + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud.com.f5 + icontrol + 1.0 + + + org.apache.axis + axis + ${cs.axis.version} + + diff --git a/plugins/network-elements/midokura-midonet/pom.xml b/plugins/network-elements/midokura-midonet/pom.xml index f305e93b47d..c6c0ec2f98e 100644 --- a/plugins/network-elements/midokura-midonet/pom.xml +++ b/plugins/network-elements/midokura-midonet/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-network-midonet - Apache CloudStack Plugin - Midokura Midonet - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-midonet + Apache CloudStack Plugin - Midokura Midonet + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 83b377a1300..e0fcf7e51e4 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -17,26 +17,26 @@ under the License. --> - 4.0.0 - cloud-plugin-network-netscaler - Apache CloudStack Plugin - Network Netscaler - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud.com.citrix - netscaler - 1.0 - - - com.cloud.com.citrix - netscaler-sdx - 1.0 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-netscaler + Apache CloudStack Plugin - Network Netscaler + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud.com.citrix + netscaler + 1.0 + + + com.cloud.com.citrix + netscaler-sdx + 1.0 + + diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index f70557ca462..8db11ae72a4 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-network-nvp - Apache CloudStack Plugin - Network Nicira NVP - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-nvp + Apache CloudStack Plugin - Network Nicira NVP + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index bd216d9b798..9385bb90a71 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-network-ovs - Apache CloudStack Plugin - Open vSwitch - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-ovs + Apache CloudStack Plugin - Open vSwitch + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/parent/pom.xml b/plugins/parent/pom.xml index 3a0bf3ce3cf..5fae41c3da4 100644 --- a/plugins/parent/pom.xml +++ b/plugins/parent/pom.xml @@ -17,26 +17,26 @@ under the License. --> - 4.0.0 - cloud-plugin-parent - Apache CloudStack Plugin POM - pom - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - - - - com.cloud - cloud-server - ${project.version} - - - - install - src - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-parent + Apache CloudStack Plugin POM + pom + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + + + + com.cloud + cloud-server + ${project.version} + + + + install + src + diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index aba14961660..658bb195cca 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-storage-allocator-random - Apache CloudStack Plugin - Storage Allocator Random - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-allocator-random + Apache CloudStack Plugin - Storage Allocator Random + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index 0dfd6bcd935..a904ee0c77d 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-user-authenticator-ldap - Apache CloudStack Plugin - User Authenticator LDAP - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-user-authenticator-ldap + Apache CloudStack Plugin - User Authenticator LDAP + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index 7f4e7809628..c9173d7b752 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-user-authenticator-md5 - Apache CloudStack Plugin - User Authenticator MD5 - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-user-authenticator-md5 + Apache CloudStack Plugin - User Authenticator MD5 + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml index e9d24d1f721..894b1b0b128 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -17,14 +17,14 @@ under the License. --> - 4.0.0 - cloud-plugin-user-authenticator-plaintext - Apache CloudStack Plugin - User Authenticator Plain Text - - com.cloud - cloud-plugin-parent - 4.0.0-SNAPSHOT - ../../parent/pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-user-authenticator-plaintext + Apache CloudStack Plugin - User Authenticator Plain Text + + com.cloud + cloud-plugin-parent + 4.0.0-SNAPSHOT + ../../parent/pom.xml + diff --git a/pom.xml b/pom.xml index 299610a16b3..4bdb5379f50 100644 --- a/pom.xml +++ b/pom.xml @@ -17,170 +17,170 @@ under the License. --> - 4.0.0 - com.cloud - cloudstack - 4.0.0-SNAPSHOT - pom - Apache CloudStack - CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. - http://www.cloudstack.org - - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git - - - jira - https://issues.apache.org/jira/browse/CLOUDSTACK - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + com.cloud + cloudstack + 4.0.0-SNAPSHOT + pom + Apache CloudStack + CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. + http://www.cloudstack.org + + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git + + + jira + https://issues.apache.org/jira/browse/CLOUDSTACK + - - 1.6 - UTF-8 - + + 1.6 + UTF-8 + - - - apache.releases.https - Apache Release Distribution Repository - https://repository.apache.org/service/local/staging/deploy/maven2 - - - apache.snapshots.https - Apache Development Snapshot Repository - https://repository.apache.org/content/repositories/snapshots - - - - apache.cloudstack.site - ${site.deploy.url} - - - - - apache.snapshots - http://repository.apache.org/snapshots/ - Apache Snapshot Repo - - true - - - false - - - - - - apache.snapshots - http://repository.apache.org/snapshots/ - - true - - - false - - - + + + apache.releases.https + Apache Release Distribution Repository + https://repository.apache.org/service/local/staging/deploy/maven2 + + + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + + + apache.cloudstack.site + ${site.deploy.url} + + + + + apache.snapshots + http://repository.apache.org/snapshots/ + Apache Snapshot Repo + + true + + + false + + + + + + apache.snapshots + http://repository.apache.org/snapshots/ + + true + + + false + + + - 2012 + 2012 - - - Apache CloudStack User List - cloudstack-users-subscribe@incubator.apache.org - cloudstack-users-unsubscribe@incubator.apache.org - cloudstack-users@incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users - - - Apache CloudStack Developer List - cloudstack-dev-subscribe@incubator.apache.org - cloudstack-dev-unsubscribe@incubator.apache.org - cloudstack-dev@incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev - - - Apache CloudStack Commits List - cloudstack-commits-subscribe@incubator.apache.org - cloudstack-commits-unsubscribe@incubator.apache.org - cloudstack-commits@incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits - - + + + Apache CloudStack User List + cloudstack-users-subscribe@incubator.apache.org + cloudstack-users-unsubscribe@incubator.apache.org + cloudstack-users@incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users + + + Apache CloudStack Developer List + cloudstack-dev-subscribe@incubator.apache.org + cloudstack-dev-unsubscribe@incubator.apache.org + cloudstack-dev@incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev + + + Apache CloudStack Commits List + cloudstack-commits-subscribe@incubator.apache.org + cloudstack-commits-unsubscribe@incubator.apache.org + cloudstack-commits@incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits + + - - - The Apache CloudStack Team - cloudstack-dev@incubator.apache.org - http://incubator.apache.org/projects/cloudstack.html - Apache Software Foundation - http://apache.org/ - - + + + The Apache CloudStack Team + cloudstack-dev@incubator.apache.org + http://incubator.apache.org/projects/cloudstack.html + Apache Software Foundation + http://apache.org/ + + - - Jenkin - http://jenkins.cloudstack.org/ - + + Jenkin + http://jenkins.cloudstack.org/ + - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + - - The Apache Software Foundation - http://www.apache.org/ - + + The Apache Software Foundation + http://www.apache.org/ + - - parent - api - agent - console-proxy - core - server - usage - utils - deps/XenServerJava - vmware-base - plugins - awsapi - + + parent + api + agent + console-proxy + core + server + usage + utils + deps/XenServerJava + vmware-base + plugins + awsapi + - - install - - - - org.apache.rat - apache-rat-plugin - 0.8 - - 350 - false - - .git/** - .gitignore - velocity.log - **/target/** - distribution/** - **/jaxb.index - **/META-INF/MANIFEST - **/src/test/**/*.txt - **/.classpath - **/.settings/**/* - **/.project - - - - - - + + install + + + + org.apache.rat + apache-rat-plugin + 0.8 + + 350 + false + + .git/** + .gitignore + velocity.log + **/target/** + distribution/** + **/jaxb.index + **/META-INF/MANIFEST + **/src/test/**/*.txt + **/.classpath + **/.settings/**/* + **/.project + + + + + + diff --git a/server/pom.xml b/server/pom.xml index c82bb6bbfee..27ea99af42a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -17,58 +17,58 @@ under the License. --> - 4.0.0 - cloud-server - Apache CloudStack Server - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - com.cloud - cloud-core - ${project.version} - - - javax.servlet - servlet-api - 2.4 - provided - - - org.apache.httpcomponents - httpcore - ${cs.httpcore.version} - - - mysql - mysql-connector-java - ${cs.mysql.version} - provided - - - com.thoughtworks.xstream - xstream - ${cs.xstream.version} - - - javax.mail - mail - ${cs.mail.version} - - - - - install - src - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-server + Apache CloudStack Server + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + com.cloud + cloud-core + ${project.version} + + + javax.servlet + servlet-api + 2.4 + provided + + + org.apache.httpcomponents + httpcore + ${cs.httpcore.version} + + + mysql + mysql-connector-java + ${cs.mysql.version} + provided + + + com.thoughtworks.xstream + xstream + ${cs.xstream.version} + + + javax.mail + mail + ${cs.mail.version} + + + + + install + src + + diff --git a/usage/pom.xml b/usage/pom.xml index cb40fc4a35a..9bae8b135f8 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -17,25 +17,25 @@ under the License. --> - 4.0.0 - cloud-usage - Apache CloudStack Usage Server - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - com.cloud - cloud-server - ${project.version} - - - - install - src - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-usage + Apache CloudStack Usage Server + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + com.cloud + cloud-server + ${project.version} + + + + install + src + diff --git a/utils/pom.xml b/utils/pom.xml index 1c28b6f9ea9..7e85a510108 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -17,117 +17,117 @@ under the License. --> - 4.0.0 - cloud-utils - Apache CloudStack Utils - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - log4j - log4j - ${cs.log4j.version} - - - cglib - cglib - ${cs.cglib.version} - - - commons-dbcp - commons-dbcp - ${cs.dbcp.version} - - - commons-pool - commons-pool - - - - - net.sf.ehcache - ehcache - ${cs.ehcache.version} - - - commons-pool - commons-pool - ${cs.pool.version} - - - commons-codec - commons-codec - ${cs.codec.version} - - - org.bouncycastle - bcprov-jdk16 - ${cs.bcprov.version} - - - com.jcraft - jsch - ${cs.jsch.version} - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - ${cs.jpa.version} - - - org.jasypt - jasypt - ${cs.jasypt.version} - - - com.trilead - trilead-ssh2 - ${cs.trilead.version} - - - log4j - apache-log4j-extras - ${cs.log4j.extras.version} - - - log4j - log4j - - - - - javax.ejb - ejb-api - ${cs.ejb.version} - - - commons-configuration - commons-configuration - ${cs.configuration.version} - - - - install - src - test - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - test-jar - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-utils + Apache CloudStack Utils + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + log4j + log4j + ${cs.log4j.version} + + + cglib + cglib + ${cs.cglib.version} + + + commons-dbcp + commons-dbcp + ${cs.dbcp.version} + + + commons-pool + commons-pool + + + + + net.sf.ehcache + ehcache + ${cs.ehcache.version} + + + commons-pool + commons-pool + ${cs.pool.version} + + + commons-codec + commons-codec + ${cs.codec.version} + + + org.bouncycastle + bcprov-jdk16 + ${cs.bcprov.version} + + + com.jcraft + jsch + ${cs.jsch.version} + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + ${cs.jpa.version} + + + org.jasypt + jasypt + ${cs.jasypt.version} + + + com.trilead + trilead-ssh2 + ${cs.trilead.version} + + + log4j + apache-log4j-extras + ${cs.log4j.extras.version} + + + log4j + log4j + + + + + javax.ejb + ejb-api + ${cs.ejb.version} + + + commons-configuration + commons-configuration + ${cs.configuration.version} + + + + install + src + test + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + test-jar + + + + + + diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 44a0d9213da..5d262288694 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -17,55 +17,55 @@ under the License. --> - 4.0.0 - cloud-vmware-base - Apache CloudStack VMware Base - - com.cloud - cloud-parent - 4.0.0-SNAPSHOT - ../parent/pom.xml - - - - com.cloud - cloud-utils - ${project.version} - - - com.google.code.gson - gson - ${cs.gson.version} - - - com.cloud.com.vmware - vmware-vim - 1.0 - - - com.cloud.com.vmware - vmware-vim25 - 1.0 - - - com.cloud.com.vmware - vmware-apputils - 1.0 - - - org.apache.axis - axis - ${cs.axis.version} - - - org.apache.axis - axis-jaxrpc - ${cs.axis.version} - - - - install - src - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-vmware-base + Apache CloudStack VMware Base + + com.cloud + cloud-parent + 4.0.0-SNAPSHOT + ../parent/pom.xml + + + + com.cloud + cloud-utils + ${project.version} + + + com.google.code.gson + gson + ${cs.gson.version} + + + com.cloud.com.vmware + vmware-vim + 1.0 + + + com.cloud.com.vmware + vmware-vim25 + 1.0 + + + com.cloud.com.vmware + vmware-apputils + 1.0 + + + org.apache.axis + axis + ${cs.axis.version} + + + org.apache.axis + axis-jaxrpc + ${cs.axis.version} + + + + install + src +