Merge "Add design spec for API upgrading and ID alignment"
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 @@
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}