You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2021/11/10 14:49:40 UTC
[cloudstack] branch 4.16 updated: Fix version and add schema
upgrade path
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 462e051 Fix version and add schema upgrade path
462e051 is described below
commit 462e0511f40cdcc44debb5aeac0e56e5f2653c90
Author: nicolas <ni...@gmail.com>
AuthorDate: Wed Nov 10 11:49:02 2021 -0300
Fix version and add schema upgrade path
---
debian/changelog | 6 ++++++
.../META-INF/db/schema-41600to41610-cleanup.sql | 20 ++++++++++++++++++++
.../resources/META-INF/db/schema-41600to41610.sql | 20 ++++++++++++++++++++
tools/checkstyle/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/marvin/setup.py | 2 +-
7 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c50dfa..e8d490b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloudstack (4.16.1.0-SNAPSHOT) unstable; urgency=low
+
+ * Update the version to 4.16.1.0-SNAPSHOT
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org> Wed, 10 Nov 2021 11:31:57 -0300
+
cloudstack (4.16.0.0) unstable; urgency=low
* Update the version to 4.16.0.0
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql
new file mode 100644
index 0000000..9db01dd
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql
@@ -0,0 +1,20 @@
+-- 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.
+
+--;
+-- Schema upgrade cleanup from 4.16.0.0 to 4.16.1.0
+--;
\ No newline at end of file
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql
new file mode 100644
index 0000000..24c5b79
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql
@@ -0,0 +1,20 @@
+-- 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.
+
+--;
+-- Schema upgrade from 4.16.0.0 to 4.16.1.0
+--;
\ No newline at end of file
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index e5b2a95..1438819 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -22,7 +22,7 @@
<name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
- <version>4.16.0.0</version>
+ <version>4.16.1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index a7f2014..31b56b8 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
FROM ubuntu:20.04
MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
ARG DEBIAN_FRONTEND=noninteractive
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index 2cce6f2..0a6a991 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -20,7 +20,7 @@
FROM python:2
MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
ENV WORK_DIR=/marvin
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 883db76..d0d97a8 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.16.0.0"
+VERSION = "4.16.1.0-SNAPSHOT"
setup(name="Marvin",
version=VERSION,