This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4ebafc44a913abb9c6854fb2f6d4822d310c6c57
Author: Paul Angus <paul.an...@shapeblue.com>
AuthorDate: Tue Jun 26 17:24:36 2018 +0100
Updating pom.xml version numbers for release 4.11.2-SNAPSHOT
Signed-off-by: Paul Angus <paul.an...@shapeblue.com>
---
debian/changelog | 408 +++++++++++++++++-----------------
services/console-proxy/plugin/pom.xml | 58 ++---
services/iam/plugin/pom.xml | 116 +++++-----
services/iam/server/pom.xml | 114 +++++-----
tools/apidoc/pom.xml | 174 +++++++--------
tools/checkstyle/pom.xml | 88 ++++----
tools/docker/Dockerfile.centos6 | 4 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/marvin/setup.py | 136 ++++++------
9 files changed, 550 insertions(+), 550 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d89b48b..3c33700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,204 +1,204 @@
-cloudstack (4.11.1.0) unstable; urgency=low
-
- * Update the version to 4.11.1.0
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Thu, 21 Jun
2018 15:52:43 +0100
-
-cloudstack (4.11.1.0-SNAPSHOT) unstable; urgency=low
-
- * Update the version to 4.11.1.0-SNAPSHOT
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Mon, 05 Feb
2018 11:10:37 +0100
-
-cloudstack (4.11.0.0) unstable; urgency=low
-
- * Update the version to 4.11.0.0
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Fri, 26 Jan
2018 13:13:37 +0100
-
-cloudstack (4.11.0.0-SNAPSHOT) unstable; urgency=low
-
- * Update the version to 4.11.0.0-SNAPSHOT
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Mon, 03 Jul
2017 10:06:42 +0530
-
-cloudstack (4.11.0.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
-
- * Update the version to 4.10.0.snapshot
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Mon, 08 Aug
2016 11:22:34 +0530
-
-cloudstack (4.9.0) unstable; urgency=low
-
- [ Remi Bergsma ]
- * Update the version to 4.9.0.snapshot
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Wed, 20 Jan
2016 23:43:35 +0100
-
-cloudstack (4.8.0-SNAPSHOT) unstable; urgency=low
-
- [ Remi Bergsma ]
- * Update the version to 4.8.0.snapshot
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Sun, 21 Dec
2015 22:11:55 +0100
-
-cloudstack (4.7.0-SNAPSHOT) unstable; urgency=low
-
- [ Remi Bergsma ]
- * Update the version to 4.7.0.snapshot
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Sun, 15 Nov
2015 21:28:33 +0100
-
-cloudstack (4.6.0-SNAPSHOT) unstable; urgency=low
-
- [ Hugo Trippaers ]
- * Update the version to 4.6.0.snapshot
-
- [ Rafael da Fonseca ]
- * Switch to dpkg-source 3.0 (native) format
-
- -- the Apache CloudStack project <d...@cloudstack.apache.org> Thu, 18 Jun
2015 11:17:09 +0200
-
-cloudstack (4.5.0-snapshot) unstable; urgency=low
-
- * Update the version to 4.5.0.snapshot
-
- -- Hugo Trippaers <h...@apache.org> Thu, 21 Nov 2013 12:00:00 -0400
-
-cloudstack (4.4.0-snapshot) unstable; urgency=low
-
- * Update the version to 4.4.0.snapshot
-
- -- Hugo Trippaers <h...@apache.org> Thu, 21 Nov 2013 12:00:00 -0400
-
-cloudstack (4.3.0-snapshot) unstable; urgency=low
-
- * Update the version to 4.3.0.snapshot
-
- -- Chip Childers <chipchild...@apache.org> Thu, 1 Aug 2013 12:00:00 -0400
-
-cloudstack (4.2.0) unstable; urgency=low
-
- * Update the version to 4.2.0 to be in sync with Maven (again)
-
- -- Wido den Hollander <w...@widodh.nl> Tue, 14 May 2013 15:56:42 +0200
-
-cloudstack (4.2.0-incubating-0.0.snapshot) unstable; urgency=low
-
- * Update the version to 4.2.0 to be in sync with Maven
-
- -- Wido den Hollander <w...@widodh.nl> Wed, 13 Mar 2013 19:15:00 +0100
-
-cloudstack (4.1.0-incubating-0.0.snapshot) unstable; urgency=low
-
- * Incorporate incubating into version, remove epoch
-
- -- Noa Resare <n...@spotify.com> Tue, 05 Feb 2013 18:05:28 +0000
-
-cloud (1:4.0.0-1) unstable; urgency=low
-
- * Bumping the version to 4.0.0
-
- -- Chip Childers <chipchild...@apache.org> Fri, 5 Oct 2012 16:00:00 -0500
-
-cloud (1:4.0.0-beta6) unstable; urgency=low
-
- * Bumping the version to 4.0 Beta 6
-
- -- Wido den Hollander <w...@widodh.nl> Fri, 5 Oct 2012 11:41:17 +0200
-
-cloud (1:4.0.0-beta1) unstable; urgency=low
-
- * Bumping the version to 4.0 Beta 1
-
- -- Wido den Hollander <w...@widodh.nl> Wed, 26 Sep 2012 21:14:48 +0200
-
-cloud (4.0.0-rc2) unstable; urgency=low
-
- * Bumping the version to 4.0 RC2
-
- -- Wido den Hollander <w...@widodh.nl> Mon, 24 Sep 2012 11:30:29 +0200
-
-cloud (4.0.0-rc1) unstable; urgency=low
-
- * Bumping the version to 4.0 RC1
-
- -- Wido den Hollander <w...@widodh.nl> Fri, 17 Aug 2012 11:10:41 +0200
-
-cloud (3.0.2) unstable; urgency=low
-
- * Bumping the package version to the latest release.
-
- -- Wido den Hollander <w...@widodh.nl> Wed, 25 Jul 2012 14:53:31 +0200
-
-cloud (2.2.2) unstable; urgency=low
-
- * Bumping version number for next CloudStack release
-
- -- Engineering <i...@cloud.com> Mon, 7 Mar 2011 11:19:34 -0700
-
-cloud (2.1.97) unstable; urgency=low
-
- * Bumping version number for next CloudStack release
-
- -- Rudd-O <man...@cloud.com> Sat, 31 Jul 2010 19:09:54 -0700
-
-cloud (2.0.97) unstable; urgency=low
-
- * Bumping version number for next CloudStack release
-
- -- Rudd-O <man...@cloud.com> Mon, 12 Jul 2010 14:01:41 -0700
-
-cloud (2.0.2) unstable; urgency=low
-
- * Bumping version number for next CloudStack release
-
- -- Rudd-O <man...@cloud.com> Fri, 2 Jul 2010 19:55:41 -0700
-
-cloud (2.0.0) unstable; urgency=low
-
- * Bumping version number for next CloudStack release
-
- -- Rudd-O <man...@cloud.com> Tue, 15 Jun 2010 12:10:05 -0700
-
-cloud (1.9.14) unstable; urgency=low
-
- * Bumping version number for next CloudStack release
-
- -- Rudd-O <man...@cloud.com> Tue, 11 May 2010 14:46:14 -0700
-
-cloud (1.9.12) unstable; urgency=low
-
- * Bumping version number for CloudStack RC4 release
-
- -- Rudd-O <man...@cloud.com> Mon, 3 May 2010 14:46:14 -0700
-
-cloud (1.9.11) unstable; urgency=low
-
- * Bumping version number for CloudStack release
-
- -- Rudd-O <man...@cloud.com> Fri, 30 Apr 2010 15:08:38 -0700
-
-cloud (1.9.10) unstable; urgency=low
-
- * Bumping version number for FOSS release
-
- -- Rudd-O <man...@vmops.com> Wed, 28 Apr 2010 22:09:48 -0700
-
-cloud (1.9.9) unstable; urgency=low
-
- * Bumping version number for new build prereleases
-
- -- Rudd-O <man...@vmops.com> Mon, 12 Apr 2010 17:39:44 -0700
-
-cloud (1.9.8) unstable; urgency=low
-
- * Branching RC3
-
- -- Rudd-O <man...@vmops.com> Mon, 05 Apr 2010 12:46:06 -0700
-
-cloud (1.9.7) unstable; urgency=low
-
- * Initial Release.
-
- -- Rudd-O <man...@vmops.com> Thu, 25 Mar 2010 15:12:06 -0700
+4.11.2-SNAPSHOTcloudstack (4.11.1.0) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.11.1.0
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Thu, 21 Jun 2018 15:52:43 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.11.1.0-SNAPSHOT) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.11.1.0-SNAPSHOT
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Mon, 05 Feb 2018 11:10:37 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.11.0.0) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.11.0.0
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Fri, 26 Jan 2018 13:13:37 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.11.0.0-SNAPSHOT) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.11.0.0-SNAPSHOT
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Mon, 03 Jul 2017 10:06:42 +0530
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.11.0.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.10.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Mon, 08 Aug 2016 11:22:34 +0530
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.9.0) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT [ Remi Bergsma ]
+4.11.2-SNAPSHOT * Update the version to 4.9.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Wed, 20 Jan 2016 23:43:35 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.8.0-SNAPSHOT) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT [ Remi Bergsma ]
+4.11.2-SNAPSHOT * Update the version to 4.8.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Sun, 21 Dec 2015 22:11:55 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.7.0-SNAPSHOT) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT [ Remi Bergsma ]
+4.11.2-SNAPSHOT * Update the version to 4.7.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Sun, 15 Nov 2015 21:28:33 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.6.0-SNAPSHOT) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT [ Hugo Trippaers ]
+4.11.2-SNAPSHOT * Update the version to 4.6.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT [ Rafael da Fonseca ]
+4.11.2-SNAPSHOT * Switch to dpkg-source 3.0 (native) format
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- the Apache CloudStack project <d...@cloudstack.apache.org>
Thu, 18 Jun 2015 11:17:09 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.5.0-snapshot) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.5.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Hugo Trippaers <h...@apache.org> Thu, 21 Nov 2013 12:00:00
-0400
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.4.0-snapshot) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.4.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Hugo Trippaers <h...@apache.org> Thu, 21 Nov 2013 12:00:00
-0400
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.3.0-snapshot) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.3.0.snapshot
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Chip Childers <chipchild...@apache.org> Thu, 1 Aug 2013
12:00:00 -0400
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.2.0) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.2.0 to be in sync with Maven (again)
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Tue, 14 May 2013
15:56:42 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.2.0-incubating-0.0.snapshot) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Update the version to 4.2.0 to be in sync with Maven
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Wed, 13 Mar 2013
19:15:00 +0100
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloudstack (4.1.0-incubating-0.0.snapshot) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Incorporate incubating into version, remove epoch
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Noa Resare <n...@spotify.com> Tue, 05 Feb 2013 18:05:28
+0000
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1:4.0.0-1) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping the version to 4.0.0
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Chip Childers <chipchild...@apache.org> Fri, 5 Oct 2012
16:00:00 -0500
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1:4.0.0-beta6) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping the version to 4.0 Beta 6
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Fri, 5 Oct 2012
11:41:17 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1:4.0.0-beta1) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping the version to 4.0 Beta 1
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Wed, 26 Sep 2012
21:14:48 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (4.0.0-rc2) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping the version to 4.0 RC2
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Mon, 24 Sep 2012
11:30:29 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (4.0.0-rc1) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping the version to 4.0 RC1
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Fri, 17 Aug 2012
11:10:41 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (3.0.2) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping the package version to the latest release.
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Wido den Hollander <w...@widodh.nl> Wed, 25 Jul 2012
14:53:31 +0200
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (2.2.2) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Engineering <i...@cloud.com> Mon, 7 Mar 2011 11:19:34 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (2.1.97) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Sat, 31 Jul 2010 19:09:54 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (2.0.97) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Mon, 12 Jul 2010 14:01:41 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (2.0.2) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Fri, 2 Jul 2010 19:55:41 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (2.0.0) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Tue, 15 Jun 2010 12:10:05 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.14) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for next CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Tue, 11 May 2010 14:46:14 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.12) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for CloudStack RC4 release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Mon, 3 May 2010 14:46:14 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.11) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for CloudStack release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@cloud.com> Fri, 30 Apr 2010 15:08:38 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.10) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for FOSS release
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@vmops.com> Wed, 28 Apr 2010 22:09:48 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.9) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Bumping version number for new build prereleases
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@vmops.com> Mon, 12 Apr 2010 17:39:44 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.8) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Branching RC3
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@vmops.com> Mon, 05 Apr 2010 12:46:06 -0700
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTcloud (1.9.7) unstable; urgency=low
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT * Initial Release.
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT -- Rudd-O <man...@vmops.com> Thu, 25 Mar 2010 15:12:06 -0700
diff --git a/services/console-proxy/plugin/pom.xml
b/services/console-proxy/plugin/pom.xml
index ec19f42..b7e855d 100644
--- a/services/console-proxy/plugin/pom.xml
+++ b/services/console-proxy/plugin/pom.xml
@@ -1,29 +1,29 @@
-<!--
- 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-console-proxy</artifactId>
- <name>Apache CloudStack Console Proxy - Plugin</name>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloudstack-service-console-proxy</artifactId>
- <version>4.11.1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-</project>
+4.11.2-SNAPSHOT<!--
+4.11.2-SNAPSHOT Licensed to the Apache Software Foundation (ASF) under one
+4.11.2-SNAPSHOT or more contributor license agreements. See the NOTICE file
+4.11.2-SNAPSHOT distributed with this work for additional information
+4.11.2-SNAPSHOT regarding copyright ownership. The ASF licenses this file
+4.11.2-SNAPSHOT to you under the Apache License, Version 2.0 (the
+4.11.2-SNAPSHOT "License"); you may not use this file except in compliance
+4.11.2-SNAPSHOT with the License. You may obtain a copy of the License at
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT http://www.apache.org/licenses/LICENSE-2.0
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT Unless required by applicable law or agreed to in writing,
+4.11.2-SNAPSHOT software distributed under the License is distributed on an
+4.11.2-SNAPSHOT "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+4.11.2-SNAPSHOT KIND, either express or implied. See the License for the
+4.11.2-SNAPSHOT specific language governing permissions and limitations
+4.11.2-SNAPSHOT under the License.
+4.11.2-SNAPSHOT-->
+4.11.2-SNAPSHOT<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";>
+4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
+4.11.2-SNAPSHOT <artifactId>cloud-plugin-console-proxy</artifactId>
+4.11.2-SNAPSHOT <name>Apache CloudStack Console Proxy - Plugin</name>
+4.11.2-SNAPSHOT <parent>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloudstack-service-console-proxy</artifactId>
+4.11.2-SNAPSHOT <version>4.11.1.0</version>
+4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
+4.11.2-SNAPSHOT </parent>
+4.11.2-SNAPSHOT</project>
diff --git a/services/iam/plugin/pom.xml b/services/iam/plugin/pom.xml
index 392dabd..2116f29 100644
--- a/services/iam/plugin/pom.xml
+++ b/services/iam/plugin/pom.xml
@@ -1,58 +1,58 @@
-<!--
- 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-iam</artifactId>
- <name>Apache CloudStack IAM - Plugin</name>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloudstack-service-iam</artifactId>
- <version>4.11.1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-engine-schema</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-iam</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+4.11.2-SNAPSHOT<!--
+4.11.2-SNAPSHOT Licensed to the Apache Software Foundation (ASF) under one
+4.11.2-SNAPSHOT or more contributor license agreements. See the NOTICE file
+4.11.2-SNAPSHOT distributed with this work for additional information
+4.11.2-SNAPSHOT regarding copyright ownership. The ASF licenses this file
+4.11.2-SNAPSHOT to you under the Apache License, Version 2.0 (the
+4.11.2-SNAPSHOT "License"); you may not use this file except in compliance
+4.11.2-SNAPSHOT with the License. You may obtain a copy of the License at
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT http://www.apache.org/licenses/LICENSE-2.0
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT Unless required by applicable law or agreed to in writing,
+4.11.2-SNAPSHOT software distributed under the License is distributed on an
+4.11.2-SNAPSHOT "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+4.11.2-SNAPSHOT KIND, either express or implied. See the License for the
+4.11.2-SNAPSHOT specific language governing permissions and limitations
+4.11.2-SNAPSHOT under the License.
+4.11.2-SNAPSHOT-->
+4.11.2-SNAPSHOT<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";>
+4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
+4.11.2-SNAPSHOT <artifactId>cloud-plugin-iam</artifactId>
+4.11.2-SNAPSHOT <name>Apache CloudStack IAM - Plugin</name>
+4.11.2-SNAPSHOT <parent>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloudstack-service-iam</artifactId>
+4.11.2-SNAPSHOT <version>4.11.1.0</version>
+4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
+4.11.2-SNAPSHOT </parent>
+4.11.2-SNAPSHOT <dependencies>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-engine-schema</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-server</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-iam</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT <type>test-jar</type>
+4.11.2-SNAPSHOT <scope>test</scope>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT </dependencies>
+4.11.2-SNAPSHOT</project>
diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml
index 9a97540..826163e 100644
--- a/services/iam/server/pom.xml
+++ b/services/iam/server/pom.xml
@@ -1,57 +1,57 @@
-<!--
- 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-iam</artifactId>
- <name>Apache CloudStack IAM - Server</name>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloudstack-service-iam</artifactId>
- <version>4.11.1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${cs.commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+4.11.2-SNAPSHOT<!--
+4.11.2-SNAPSHOT Licensed to the Apache Software Foundation (ASF) under one
+4.11.2-SNAPSHOT or more contributor license agreements. See the NOTICE file
+4.11.2-SNAPSHOT distributed with this work for additional information
+4.11.2-SNAPSHOT regarding copyright ownership. The ASF licenses this file
+4.11.2-SNAPSHOT to you under the Apache License, Version 2.0 (the
+4.11.2-SNAPSHOT "License"); you may not use this file except in compliance
+4.11.2-SNAPSHOT with the License. You may obtain a copy of the License at
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT http://www.apache.org/licenses/LICENSE-2.0
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT Unless required by applicable law or agreed to in writing,
+4.11.2-SNAPSHOT software distributed under the License is distributed on an
+4.11.2-SNAPSHOT "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+4.11.2-SNAPSHOT KIND, either express or implied. See the License for the
+4.11.2-SNAPSHOT specific language governing permissions and limitations
+4.11.2-SNAPSHOT under the License.
+4.11.2-SNAPSHOT-->
+4.11.2-SNAPSHOT<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";>
+4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
+4.11.2-SNAPSHOT <artifactId>cloud-iam</artifactId>
+4.11.2-SNAPSHOT <name>Apache CloudStack IAM - Server</name>
+4.11.2-SNAPSHOT <parent>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloudstack-service-iam</artifactId>
+4.11.2-SNAPSHOT <version>4.11.1.0</version>
+4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
+4.11.2-SNAPSHOT </parent>
+4.11.2-SNAPSHOT <dependencies>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>commons-io</groupId>
+4.11.2-SNAPSHOT <artifactId>commons-io</artifactId>
+4.11.2-SNAPSHOT <version>${cs.commons-io.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>net.sf.ehcache</groupId>
+4.11.2-SNAPSHOT <artifactId>ehcache-core</artifactId>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-utils</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-api</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT <type>test-jar</type>
+4.11.2-SNAPSHOT <scope>test</scope>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT </dependencies>
+4.11.2-SNAPSHOT</project>
diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 10b014a..0e269ac 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -1,87 +1,87 @@
-<!-- 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-apidoc</artifactId>
- <name>Apache CloudStack apidocs</name>
- <packaging>pom</packaging>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-tools</artifactId>
- <version>4.11.1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <properties>
- <client.config.base>../../client/target/</client.config.base>
-
<client.config.jars>${client.config.base}/cloud-client-ui-${project.version}.jar</client.config.jars>
- <client.config.conf>${client.config.base}/classes</client.config.conf>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-client-ui</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>bash</executable>
- <arguments>
- <argument>./build-apidoc.sh</argument>
- <argument>${client.config.jars}</argument>
- <argument>${client.config.jars}</argument>
- <argument>./target</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>target</workingDirectory>
- <executable>tar</executable>
- <arguments>
- <argument>-cjf</argument>
- <argument>apidoc.tar.bz2</argument>
- <argument>xmldoc</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
+4.11.2-SNAPSHOT<!-- Licensed to the Apache Software Foundation (ASF) under one
or more contributor
+4.11.2-SNAPSHOT license agreements. See the NOTICE file distributed with this
work for additional
+4.11.2-SNAPSHOT information regarding copyright ownership. The ASF licenses
this file to
+4.11.2-SNAPSHOT you under the Apache License, Version 2.0 (the "License");
you may not use
+4.11.2-SNAPSHOT this file except in compliance with the License. You may
obtain a copy of
+4.11.2-SNAPSHOT the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required
+4.11.2-SNAPSHOT by applicable law or agreed to in writing, software
distributed under the
+4.11.2-SNAPSHOT License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS
+4.11.2-SNAPSHOT OF ANY KIND, either express or implied. See the License for
the specific
+4.11.2-SNAPSHOT language governing permissions and limitations under the
License. -->
+4.11.2-SNAPSHOT<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+4.11.2-SNAPSHOT xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
+4.11.2-SNAPSHOT <artifactId>cloud-apidoc</artifactId>
+4.11.2-SNAPSHOT <name>Apache CloudStack apidocs</name>
+4.11.2-SNAPSHOT <packaging>pom</packaging>
+4.11.2-SNAPSHOT <parent>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-tools</artifactId>
+4.11.2-SNAPSHOT <version>4.11.1.0</version>
+4.11.2-SNAPSHOT <relativePath>../pom.xml</relativePath>
+4.11.2-SNAPSHOT </parent>
+4.11.2-SNAPSHOT <properties>
+4.11.2-SNAPSHOT
<client.config.base>../../client/target/</client.config.base>
+4.11.2-SNAPSHOT
<client.config.jars>${client.config.base}/cloud-client-ui-${project.version}.jar</client.config.jars>
+4.11.2-SNAPSHOT
<client.config.conf>${client.config.base}/classes</client.config.conf>
+4.11.2-SNAPSHOT </properties>
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT <dependencies>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-server</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT <dependency>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>cloud-client-ui</artifactId>
+4.11.2-SNAPSHOT <version>${project.version}</version>
+4.11.2-SNAPSHOT <type>pom</type>
+4.11.2-SNAPSHOT </dependency>
+4.11.2-SNAPSHOT </dependencies>
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT <build>
+4.11.2-SNAPSHOT <defaultGoal>install</defaultGoal>
+4.11.2-SNAPSHOT <plugins>
+4.11.2-SNAPSHOT <plugin>
+4.11.2-SNAPSHOT <groupId>org.codehaus.mojo</groupId>
+4.11.2-SNAPSHOT <artifactId>exec-maven-plugin</artifactId>
+4.11.2-SNAPSHOT <version>1.2.1</version>
+4.11.2-SNAPSHOT <executions>
+4.11.2-SNAPSHOT <execution>
+4.11.2-SNAPSHOT <id>compile</id>
+4.11.2-SNAPSHOT <phase>compile</phase>
+4.11.2-SNAPSHOT <goals>
+4.11.2-SNAPSHOT <goal>exec</goal>
+4.11.2-SNAPSHOT </goals>
+4.11.2-SNAPSHOT <configuration>
+4.11.2-SNAPSHOT <executable>bash</executable>
+4.11.2-SNAPSHOT <arguments>
+4.11.2-SNAPSHOT
<argument>./build-apidoc.sh</argument>
+4.11.2-SNAPSHOT
<argument>${client.config.jars}</argument>
+4.11.2-SNAPSHOT
<argument>${client.config.jars}</argument>
+4.11.2-SNAPSHOT <argument>./target</argument>
+4.11.2-SNAPSHOT </arguments>
+4.11.2-SNAPSHOT </configuration>
+4.11.2-SNAPSHOT </execution>
+4.11.2-SNAPSHOT <execution>
+4.11.2-SNAPSHOT <id>package</id>
+4.11.2-SNAPSHOT <phase>package</phase>
+4.11.2-SNAPSHOT <goals>
+4.11.2-SNAPSHOT <goal>exec</goal>
+4.11.2-SNAPSHOT </goals>
+4.11.2-SNAPSHOT <configuration>
+4.11.2-SNAPSHOT
<workingDirectory>target</workingDirectory>
+4.11.2-SNAPSHOT <executable>tar</executable>
+4.11.2-SNAPSHOT <arguments>
+4.11.2-SNAPSHOT <argument>-cjf</argument>
+4.11.2-SNAPSHOT
<argument>apidoc.tar.bz2</argument>
+4.11.2-SNAPSHOT <argument>xmldoc</argument>
+4.11.2-SNAPSHOT </arguments>
+4.11.2-SNAPSHOT </configuration>
+4.11.2-SNAPSHOT </execution>
+4.11.2-SNAPSHOT </executions>
+4.11.2-SNAPSHOT </plugin>
+4.11.2-SNAPSHOT </plugins>
+4.11.2-SNAPSHOT </build>
+4.11.2-SNAPSHOT</project>
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index ec9ed9f..de87d33 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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>
-
- <name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>checkstyle</artifactId>
- <version>4.11.1.0</version>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
- <executions>
- <execution>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+4.11.2-SNAPSHOT<?xml version="1.0" encoding="UTF-8"?>
+4.11.2-SNAPSHOT<!--
+4.11.2-SNAPSHOT ~ Licensed to the Apache Software Foundation (ASF) under one
+4.11.2-SNAPSHOT ~ or more contributor license agreements. See the NOTICE file
+4.11.2-SNAPSHOT ~ distributed with this work for additional information
+4.11.2-SNAPSHOT ~ regarding copyright ownership. The ASF licenses this file
+4.11.2-SNAPSHOT ~ to you under the Apache License, Version 2.0 (the
+4.11.2-SNAPSHOT ~ "License"); you may not use this file except in compliance
+4.11.2-SNAPSHOT ~ with the License. You may obtain a copy of the License at
+4.11.2-SNAPSHOT ~
+4.11.2-SNAPSHOT ~ http://www.apache.org/licenses/LICENSE-2.0
+4.11.2-SNAPSHOT ~
+4.11.2-SNAPSHOT ~ Unless required by applicable law or agreed to in writing,
+4.11.2-SNAPSHOT ~ software distributed under the License is distributed on an
+4.11.2-SNAPSHOT ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+4.11.2-SNAPSHOT ~ KIND, either express or implied. See the License for the
+4.11.2-SNAPSHOT ~ specific language governing permissions and limitations
+4.11.2-SNAPSHOT ~ under the License.
+4.11.2-SNAPSHOT -->
+4.11.2-SNAPSHOT<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+4.11.2-SNAPSHOT xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.11.2-SNAPSHOT <modelVersion>4.0.0</modelVersion>
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT <name>Apache CloudStack Developer Tools - Checkstyle
Configuration</name>
+4.11.2-SNAPSHOT <groupId>org.apache.cloudstack</groupId>
+4.11.2-SNAPSHOT <artifactId>checkstyle</artifactId>
+4.11.2-SNAPSHOT <version>4.11.1.0</version>
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT <build>
+4.11.2-SNAPSHOT <plugins>
+4.11.2-SNAPSHOT <plugin>
+4.11.2-SNAPSHOT <groupId>org.apache.maven.plugins</groupId>
+4.11.2-SNAPSHOT <artifactId>maven-checkstyle-plugin</artifactId>
+4.11.2-SNAPSHOT <version>2.13</version>
+4.11.2-SNAPSHOT <executions>
+4.11.2-SNAPSHOT <execution>
+4.11.2-SNAPSHOT <phase>none</phase>
+4.11.2-SNAPSHOT </execution>
+4.11.2-SNAPSHOT </executions>
+4.11.2-SNAPSHOT </plugin>
+4.11.2-SNAPSHOT </plugins>
+4.11.2-SNAPSHOT </build>
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT</project>
diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6
index 590ca13..098db53 100644
--- a/tools/docker/Dockerfile.centos6
+++ b/tools/docker/Dockerfile.centos6
@@ -26,8 +26,8 @@ ENV
PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessf
RUN rpm -i
http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.3-1.el6.x86_64.rpm
RUN yum install -y nc wget \
- ${PKG_URL}/cloudstack-common-4.11.1.0.el6.x86_64.rpm \
- ${PKG_URL}/cloudstack-management-4.11.1.0.el6.x86_64.rpm
+ ${PKG_URL}/cloudstack-common-4.11.2-SNAPSHOT.el6.x86_64.rpm \
+ ${PKG_URL}/cloudstack-management-4.11.2-SNAPSHOT.el6.x86_64.rpm
RUN cd /etc/cloudstack/management; \
ln -s tomcat6-nonssl.conf tomcat6.conf; \
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index d48f11b..7c81e64 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -24,7 +24,7 @@ LABEL Vendor="Apache.org" License="ApacheV2"
Version="4.11.1.0"
ENV WORK_DIR=/marvin
-ENV
PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.1.0.tar.gz
+ENV
PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.2-SNAPSHOT.tar.gz
RUN apt-get update && apt-get install -y vim
RUN pip install --upgrade paramiko nose requests
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 0fc487a..b894b9f 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -1,68 +1,68 @@
-#!/usr/bin/env python
-# 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.
-
-try:
- from setuptools import setup, find_packages
-except ImportError:
- try:
- from distribute_setup import use_setuptools
- use_setuptools()
- from setuptools import setup, find_packages
- except ImportError:
- raise RuntimeError("python setuptools is required to build Marvin")
-
-
-VERSION = "4.11.1.0"
-
-setup(name="Marvin",
- version=VERSION,
- description="Marvin - Python client for Apache CloudStack",
- author="The Apache CloudStack Team",
- author_email="d...@cloudstack.apache.org",
- maintainer="The Apache CloudStack Team",
- maintainer_email="d...@cloudstack.apache.org",
- long_description="Marvin is the Apache CloudStack python "
- "client written around the unittest framework",
- platforms=("Any",),
- url="https://builds.apache.org/job/cloudstack-marvin/";,
- packages=["marvin", "marvin.cloudstackAPI",
- "marvin.lib", "marvin.config", "marvin.sandbox",
- "marvin.sandbox.advanced", "marvin.sandbox.advancedsg",
- "marvin.sandbox.basic"],
- license="LICENSE.txt",
- install_requires=[
- "mysql-connector-python >= 1.1.6",
- "requests >= 2.2.1",
- "paramiko >= 1.13.0",
- "nose >= 1.3.3",
- "ddt >= 0.4.0",
- "pyvmomi >= 5.5.0",
- "netaddr >= 0.7.14",
- "dnspython",
- "ipmisim >= 0.7"
- ],
- extras_require={
- "nuagevsp": ["vspk", "PyYAML", "futures", "netaddr", "retries",
"jpype1"]
- },
- py_modules=['marvin.marvinPlugin'],
- zip_safe=False,
- entry_points={
- 'nose.plugins': ['marvinPlugin = marvin.marvinPlugin:MarvinPlugin'],
- 'console_scripts': ['marvincli = marvin.deployAndRun:main']
- },
- )
+4.11.2-SNAPSHOT#!/usr/bin/env python
+4.11.2-SNAPSHOT# Licensed to the Apache Software Foundation (ASF) under one
+4.11.2-SNAPSHOT# or more contributor license agreements. See the NOTICE file
+4.11.2-SNAPSHOT# distributed with this work for additional information
+4.11.2-SNAPSHOT# regarding copyright ownership. The ASF licenses this file
+4.11.2-SNAPSHOT# to you under the Apache License, Version 2.0 (the
+4.11.2-SNAPSHOT# "License"); you may not use this file except in compliance
+4.11.2-SNAPSHOT# with the License. You may obtain a copy of the License at
+4.11.2-SNAPSHOT#
+4.11.2-SNAPSHOT# http://www.apache.org/licenses/LICENSE-2.0
+4.11.2-SNAPSHOT#
+4.11.2-SNAPSHOT# Unless required by applicable law or agreed to in writing,
+4.11.2-SNAPSHOT# software distributed under the License is distributed on an
+4.11.2-SNAPSHOT# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+4.11.2-SNAPSHOT# KIND, either express or implied. See the License for the
+4.11.2-SNAPSHOT# specific language governing permissions and limitations
+4.11.2-SNAPSHOT# under the License.
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTtry:
+4.11.2-SNAPSHOT from setuptools import setup, find_packages
+4.11.2-SNAPSHOTexcept ImportError:
+4.11.2-SNAPSHOT try:
+4.11.2-SNAPSHOT from distribute_setup import use_setuptools
+4.11.2-SNAPSHOT use_setuptools()
+4.11.2-SNAPSHOT from setuptools import setup, find_packages
+4.11.2-SNAPSHOT except ImportError:
+4.11.2-SNAPSHOT raise RuntimeError("python setuptools is required to
build Marvin")
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTVERSION = "4.11.1.0"
+4.11.2-SNAPSHOT
+4.11.2-SNAPSHOTsetup(name="Marvin",
+4.11.2-SNAPSHOT version=VERSION,
+4.11.2-SNAPSHOT description="Marvin - Python client for Apache
CloudStack",
+4.11.2-SNAPSHOT author="The Apache CloudStack Team",
+4.11.2-SNAPSHOT author_email="d...@cloudstack.apache.org",
+4.11.2-SNAPSHOT maintainer="The Apache CloudStack Team",
+4.11.2-SNAPSHOT maintainer_email="d...@cloudstack.apache.org",
+4.11.2-SNAPSHOT long_description="Marvin is the Apache CloudStack python "
+4.11.2-SNAPSHOT "client written around the unittest
framework",
+4.11.2-SNAPSHOT platforms=("Any",),
+4.11.2-SNAPSHOT url="https://builds.apache.org/job/cloudstack-marvin/";,
+4.11.2-SNAPSHOT packages=["marvin", "marvin.cloudstackAPI",
+4.11.2-SNAPSHOT "marvin.lib", "marvin.config", "marvin.sandbox",
+4.11.2-SNAPSHOT "marvin.sandbox.advanced",
"marvin.sandbox.advancedsg",
+4.11.2-SNAPSHOT "marvin.sandbox.basic"],
+4.11.2-SNAPSHOT license="LICENSE.txt",
+4.11.2-SNAPSHOT install_requires=[
+4.11.2-SNAPSHOT "mysql-connector-python >= 1.1.6",
+4.11.2-SNAPSHOT "requests >= 2.2.1",
+4.11.2-SNAPSHOT "paramiko >= 1.13.0",
+4.11.2-SNAPSHOT "nose >= 1.3.3",
+4.11.2-SNAPSHOT "ddt >= 0.4.0",
+4.11.2-SNAPSHOT "pyvmomi >= 5.5.0",
+4.11.2-SNAPSHOT "netaddr >= 0.7.14",
+4.11.2-SNAPSHOT "dnspython",
+4.11.2-SNAPSHOT "ipmisim >= 0.7"
+4.11.2-SNAPSHOT ],
+4.11.2-SNAPSHOT extras_require={
+4.11.2-SNAPSHOT "nuagevsp": ["vspk", "PyYAML", "futures", "netaddr",
"retries", "jpype1"]
+4.11.2-SNAPSHOT },
+4.11.2-SNAPSHOT py_modules=['marvin.marvinPlugin'],
+4.11.2-SNAPSHOT zip_safe=False,
+4.11.2-SNAPSHOT entry_points={
+4.11.2-SNAPSHOT 'nose.plugins': ['marvinPlugin =
marvin.marvinPlugin:MarvinPlugin'],
+4.11.2-SNAPSHOT 'console_scripts': ['marvincli =
marvin.deployAndRun:main']
+4.11.2-SNAPSHOT },
+4.11.2-SNAPSHOT )
