From 7f0e833aa5a05b4004fa29b8feb9e862c9a12257 Mon Sep 17 00:00:00 2001
From: Yun Huang <yun.huang@windriver.com>
Date: Tue, 12 Jun 2018 16:16:49 +0800
Subject: Bump version after Beijing release

Bump version from 1.1.2 to 1.2.0

Change-Id: I72d8f5ba7fef9546120222f1d76133cc1fbf8341
Issue-ID: MULTICLOUD-245
Signed-off-by: Yun Huang <yun.huang@windriver.com>
---
 newton/docker/build_image.sh    | 4 ++--
 newton/pom.xml                  | 2 +-
 ocata/docker/build_image.sh     | 4 ++--
 ocata/pom.xml                   | 2 +-
 pom.xml                         | 2 +-
 version.properties              | 4 ++--
 windriver/docker/build_image.sh | 4 ++--
 windriver/pom.xml               | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh
index 7b8401eb..d9dce133 100644
--- a/newton/docker/build_image.sh
+++ b/newton/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.1.2-SNAPSHOT"
-STAGING="1.1.2-STAGING"
+VERSION="1.2.0-SNAPSHOT"
+STAGING="1.2.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-newton"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/newton/pom.xml b/newton/pom.xml
index 1d23ad16..9ffcc8eb 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-newton</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud/openstack/newton</name>
     <description>multicloud for openstack newton</description>
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index 8e55f89f..03b11212 100644
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -5,8 +5,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
 cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
-VERSION="1.1.2-SNAPSHOT"
-STAGING="1.1.2-STAGING"
+VERSION="1.2.0-SNAPSHOT"
+STAGING="1.2.0-STAGING"
 IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}"
 
 if [ $HTTP_PROXY ]; then
diff --git a/ocata/pom.xml b/ocata/pom.xml
index 7ef3c588..b2e9a50e 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-ocata</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud/openstack/ocata</name>
     <description>multicloud for openstack ocata</description>
diff --git a/pom.xml b/pom.xml
index 07b6756e..15cbd80d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-root</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>multicloud-openstack</name>
     <packaging>pom</packaging>
     <description>multicloud openstack</description>
diff --git a/version.properties b/version.properties
index d5a45f9e..ad28459d 100644
--- a/version.properties
+++ b/version.properties
@@ -17,8 +17,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
-patch=2
+minor=2
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh
index 18a9dac9..7c15c735 100644
--- a/windriver/docker/build_image.sh
+++ b/windriver/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.1.2-SNAPSHOT"
-STAGING="1.1.2-STAGING"
+VERSION="1.2.0-SNAPSHOT"
+STAGING="1.2.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-windriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 0ee06581..9de5bd1c 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-windriver</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud/openstack/windriver</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>
-- 
cgit