From aa6355ffe6d14ae8e87c70795d94b6bc1a3ad1a1 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 1 Oct 2012 10:56:46 -0700 Subject: [PATCH] Updated master to 4.1.0 mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT --- agent/pom.xml | 5 ++--- api/pom.xml | 5 ++--- awsapi/pom.xml | 9 ++++----- client/pom.xml | 15 +++++++-------- console-proxy/pom.xml | 5 ++--- core/pom.xml | 5 ++--- deps/XenServerJava/pom.xml | 5 ++--- deps/pom.xml | 7 +++---- developer/pom.xml | 5 ++--- patches/pom.xml | 5 ++--- .../user-concentrated-pod/pom.xml | 5 ++--- .../deployment-planners/user-dispersing/pom.xml | 5 ++--- plugins/file-systems/netapp/pom.xml | 5 ++--- plugins/host-allocators/random/pom.xml | 5 ++--- plugins/hypervisors/kvm/pom.xml | 5 ++--- plugins/hypervisors/ovm/pom.xml | 5 ++--- plugins/hypervisors/vmware/pom.xml | 5 ++--- plugins/hypervisors/xen/pom.xml | 5 ++--- .../network-elements/elastic-loadbalancer/pom.xml | 5 ++--- plugins/network-elements/f5/pom.xml | 5 ++--- plugins/network-elements/juniper-srx/pom.xml | 5 ++--- plugins/network-elements/netscaler/pom.xml | 5 ++--- plugins/network-elements/nicira-nvp/pom.xml | 5 ++--- plugins/network-elements/ovs/pom.xml | 5 ++--- plugins/pom.xml | 5 ++--- plugins/storage-allocators/random/pom.xml | 5 ++--- plugins/user-authenticators/ldap/pom.xml | 5 ++--- plugins/user-authenticators/md5/pom.xml | 5 ++--- plugins/user-authenticators/plain-text/pom.xml | 5 ++--- pom.xml | 5 ++--- server/pom.xml | 5 ++--- test/pom.xml | 5 ++--- usage/pom.xml | 5 ++--- utils/pom.xml | 5 ++--- 34 files changed, 76 insertions(+), 110 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index a5595805042..458d97ce4df 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-agent Apache CloudStack Agents org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/api/pom.xml b/api/pom.xml index db147758ff3..f25a6bcbf74 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-api Apache CloudStack API org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 9654c2e73dd..f7db10addf2 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -16,16 +16,15 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-awsapi - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT Apache CloudStack AWS API Bridge org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -321,7 +320,7 @@ - + diff --git a/client/pom.xml b/client/pom.xml index 50b85e956f8..3929894d560 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-client-ui Apache CloudStack Client UI @@ -25,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -152,15 +151,15 @@ - - + + - + - + @@ -204,7 +203,7 @@ - + diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 8bfb75363f5..b69725f1543 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-console-proxy Apache CloudStack Console Proxy org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 510cb04105e..23bbee56dd4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-core Apache CloudStack Core org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml index 13375144534..18ba54f56a3 100644 --- a/deps/XenServerJava/pom.xml +++ b/deps/XenServerJava/pom.xml @@ -16,13 +16,12 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml xapi diff --git a/deps/pom.xml b/deps/pom.xml index ffc0e75ac14..38bb17108c0 100644 --- a/deps/pom.xml +++ b/deps/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-deps Apache CloudStack Dependencies @@ -25,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -176,7 +175,7 @@ - + diff --git a/developer/pom.xml b/developer/pom.xml index 25e56e0b8b4..f0742e4fbc4 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -8,8 +8,7 @@ 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. --> - + 4.0.0 org.apache.cloudstack cloud-developer @@ -18,7 +17,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/patches/pom.xml b/patches/pom.xml index d62fc860185..d8267619153 100644 --- a/patches/pom.xml +++ b/patches/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-patches Apache CloudStack SystemVM Patches org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml index ca2fae143ab..78829356170 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-planner-user-concentrated-pod Apache CloudStack Plugin - User Concentrated Pod Deployment Planner org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml index 6e1ffc6f026..33f6582e72f 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-planner-user-dispersing Apache CloudStack Plugin - User Dispersing Deployment Planner org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml index f10e5a4a499..d2fdda8e8ff 100644 --- a/plugins/file-systems/netapp/pom.xml +++ b/plugins/file-systems/netapp/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-netapp Apache CloudStack Plugin - NetApp File System org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index ad66c0e0af0..ba7e1ae1e65 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-host-allocator-random Apache CloudStack Plugin - Host Allocator Random org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 48630856769..a192e780c28 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-kvm Apache CloudStack Plugin - Hypervisor KVM org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index a8b23d0b943..cf52a196584 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-ovm Apache CloudStack Plugin - Hypervisor OracleVM org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 435ae38b847..22478c4edaa 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-vmware Apache CloudStack Plugin - Hypervisor VMware org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml index bf38e47adfa..8ebe0304042 100644 --- a/plugins/hypervisors/xen/pom.xml +++ b/plugins/hypervisors/xen/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-xen Apache CloudStack Plugin - Hypervisor Xen org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml index c1ab2c56664..dac500d8fd2 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-elb Apache CloudStack Plugin - Network Elastic Load Balancer org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index 0cba48cdfcf..bf40332cfbb 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-f5 Apache CloudStack Plugin - F5 org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index 38a2b550c7e..6040720da6e 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-srx Apache CloudStack Plugin - Juniper SRX org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 377e6e0f228..b11009d8b1a 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-netscaler Apache CloudStack Plugin - Network Netscaler org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 37c3a3a6ecd..70f85607e4a 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-nvp Apache CloudStack Plugin - Network Nicira NVP org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index 02d455c2b54..ab7ffab8465 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-ovs Apache CloudStack Plugin - Open vSwitch org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 206d4a1c1aa..ffd1fe90d2f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloudstack-plugins Apache CloudStack Plugin POM @@ -25,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT install diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index 6cb60cdf7ff..b476d1de49f 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-storage-allocator-random Apache CloudStack Plugin - Storage Allocator Random org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index 7facc3f3307..05e9466d825 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-user-authenticator-ldap Apache CloudStack Plugin - User Authenticator LDAP org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index 1dac92d7e3f..f358f8f1c21 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-user-authenticator-md5 Apache CloudStack Plugin - User Authenticator MD5 org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml index a4280a37d26..6406fa92489 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-user-authenticator-plaintext Apache CloudStack Plugin - User Authenticator Plain Text org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 93621dd0994..67efdc2232c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -28,7 +27,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT pom Apache CloudStack CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. diff --git a/server/pom.xml b/server/pom.xml index f7178d8eb0a..4d38fb317a9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-server Apache CloudStack Server org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/test/pom.xml b/test/pom.xml index f70a89f825a..4507e8cc916 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-testclient Apache CloudStack Test org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/usage/pom.xml b/usage/pom.xml index 92e5e728f1a..258bf847168 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-usage Apache CloudStack Usage Server org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/utils/pom.xml b/utils/pom.xml index e8d7827a7fd..8309a6433c1 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-utils Apache CloudStack Utils org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT