From: liangke <lokyse@163.com>
Date: Fri, 27 Jul 2018 10:25:30 +0000 (+0800)
Subject: Bump version to 1.2.0
X-Git-Tag: 1.2.0~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=0869aa4af09167bd2ac41c4fcf19bd921f84e7c9

Bump version to 1.2.0

Change-Id: Ib0a3241e2a0e6ad508c8602d4e75c64663e21904
Issue-ID: MULTICLOUD-286
Signed-off-by: liangke <lokyse@163.com>
---

diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh
index 1a2a81c..aa3db1b 100644
--- a/multivimbroker/docker/build_image.sh
+++ b/multivimbroker/docker/build_image.sh
@@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.1.2-SNAPSHOT"
-STAGING_VERSION="1.1.2-STAGING"
+VERSION="1.2.0-SNAPSHOT"
+STAGING_VERSION="1.2.0-STAGING"
 PROJECT="multicloud"
 IMAGE="framework"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index c05d2a6..24baf9e 100644
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework.broker</groupId>
     <artifactId>multicloud-framework-broker</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>
diff --git a/pom.xml b/pom.xml
index 8a10a3f..0b56041 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multivim broker</description>
diff --git a/version.properties b/version.properties
index 944b7e5..4590fae 100644
--- a/version.properties
+++ b/version.properties
@@ -18,8 +18,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}