From: xinhuili <lxinhui@vmware.com>
Date: Wed, 2 May 2018 07:41:57 +0000 (+0000)
Subject: Merge "    Update artifact version"
X-Git-Tag: v1.1.2~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=93e73a8d52e5ae6b261da83884b32fe1e8e2d909;hp=2c43009514c1e32bb45149e0fbf7f293804c2337

Merge "    Update artifact version"
---

diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh
index a365a0b..1a2a81c 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.0.0-SNAPSHOT"
-STAGING_VERSION="1.0.0-STAGING"
+VERSION="1.1.2-SNAPSHOT"
+STAGING_VERSION="1.1.2-STAGING"
 PROJECT="multicloud"
 IMAGE="framework"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -42,4 +42,4 @@ function push_image {
 }
 
 build_image
-push_image
\ No newline at end of file
+push_image
diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index fbd40c0..c05d2a6 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.0-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework.broker</groupId>
     <artifactId>multicloud-framework-broker</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>
@@ -55,4 +55,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index bdd5736..8a10a3f 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.0-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multivim broker</description>
diff --git a/version.properties b/version.properties
index aea6c47..944b7e5 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=1
-patch=0
+patch=2
 
 base_version=${major}.${minor}.${patch}