This is an automated email from the ASF dual-hosted git repository. paul_a pushed a commit to branch 4.11.2.0-RC20180926T2114 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 66a44f30a98d6e8893bb0bf98c53dc7f2de1d93f Author: Paul Angus <[email protected]> AuthorDate: Wed Sep 26 21:14:59 2018 +0100 Updating pom.xml version numbers for release 4.11.2.0 Signed-off-by: Paul Angus <[email protected]> --- debian/changelog | 6 ++++++ services/console-proxy/plugin/pom.xml | 2 +- services/iam/plugin/pom.xml | 2 +- services/iam/server/pom.xml | 2 +- tools/apidoc/pom.xml | 2 +- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.centos6 | 6 +++--- tools/docker/Dockerfile.marvin | 4 ++-- tools/marvin/setup.py | 2 +- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index a5ad7fd..48ef5a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloudstack (4.11.2.0) unstable; urgency=low + + * Update the version to 4.11.2.0 + + -- the Apache CloudStack project <[email protected]> Wed, 26 Sep 2018 21:14:58 +0100 + cloudstack (4.11.2.0-SNAPSHOT) unstable; urgency=low * Update the version to 4.11.2.0-SNAPSHOT diff --git a/services/console-proxy/plugin/pom.xml b/services/console-proxy/plugin/pom.xml index 321dcfd..71f0f37 100644 --- a/services/console-proxy/plugin/pom.xml +++ b/services/console-proxy/plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack-service-console-proxy</artifactId> - <version>4.11.2.0-SNAPSHOT</version> + <version>4.11.2.0</version> <relativePath>../pom.xml</relativePath> </parent> </project> diff --git a/services/iam/plugin/pom.xml b/services/iam/plugin/pom.xml index 373aed2..243b7e9 100644 --- a/services/iam/plugin/pom.xml +++ b/services/iam/plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack-service-iam</artifactId> - <version>4.11.2.0-SNAPSHOT</version> + <version>4.11.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml index e12b5af..1eef886 100644 --- a/services/iam/server/pom.xml +++ b/services/iam/server/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack-service-iam</artifactId> - <version>4.11.2.0-SNAPSHOT</version> + <version>4.11.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <dependencies> diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index 6389217..95136ee 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-tools</artifactId> - <version>4.11.2.0-SNAPSHOT</version> + <version>4.11.2.0</version> <relativePath>../pom.xml</relativePath> </parent> <properties> diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 4429bf6..ef7d041 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:16.04 MAINTAINER "Apache CloudStack" <[email protected]> -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.2.0-SNAPSHOT" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.2.0" RUN apt-get -y update && apt-get install -y \ genisoimage \ diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6 index fd0d26c..ef51aa0 100644 --- a/tools/docker/Dockerfile.centos6 +++ b/tools/docker/Dockerfile.centos6 @@ -18,7 +18,7 @@ FROM centos:6 MAINTAINER "Apache CloudStack" <[email protected]> -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.2.0-SNAPSHOT" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.2.0" ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64 @@ -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.2.0-SNAPSHOT.el6.x86_64.rpm \ - ${PKG_URL}/cloudstack-management-4.11.2.0-SNAPSHOT.el6.x86_64.rpm + ${PKG_URL}/cloudstack-common-4.11.2.0.el6.x86_64.rpm \ + ${PKG_URL}/cloudstack-management-4.11.2.0.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 fa87e4a..505ab32 100644 --- a/tools/docker/Dockerfile.marvin +++ b/tools/docker/Dockerfile.marvin @@ -20,11 +20,11 @@ FROM python:2 MAINTAINER "Apache CloudStack" <[email protected]> -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.2.0-SNAPSHOT" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.2.0" ENV WORK_DIR=/marvin -ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.2.0-SNAPSHOT.tar.gz +ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.2.0.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 1c62d56..428b036 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -27,7 +27,7 @@ except ImportError: raise RuntimeError("python setuptools is required to build Marvin") -VERSION = "4.11.2.0-SNAPSHOT" +VERSION = "4.11.2.0" setup(name="Marvin", version=VERSION,
