git checkoutBump gvnfm vnfmgr version to 1.2.0

Issue-ID: VFC-1066
Change-Id: I63be07e997f324d9bdf2eb79098663054db58597
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

diff --git a/mgr/docker/build_image.sh b/mgr/docker/build_image.sh
index fb56974..b18dd8c 100755 (executable)
--- a/mgr/docker/build_image.sh
+++ b/mgr/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.1.0"
+VERSION="1.2.0"
 PROJECT="vfc"
 IMAGE="vnfmgr"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/mgr/pom.xml b/mgr/pom.xml
index 11131c4..4e91b06 100644 (file)
--- a/mgr/pom.xml
+++ b/mgr/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.gvnfm.vnfmgr</groupId>
         <artifactId>vfc-gvnfm-vnfmgr</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.gvnfm.vnfmgr.mgr</groupId>
     <artifactId>vfc-gvnfm-vnfmgr-mgr</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-gvnfm-vnfmgr-mgr</name>
     <properties>

diff --git a/pom.xml b/pom.xml
index d41e212..26fd48a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.gvnfm.vnfmgr</groupId>
     <artifactId>vfc-gvnfm-vnfmgr</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-gvnfm-vnfmgr</name>
     <description>vfc gvnfm vnfmgr</description>

diff --git a/version.properties b/version.properties
index d7c69cd..2cddbb0 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
+minor=2
 patch=0
 
 base_version=${major}.${minor}.${patch}