Update version from 1.2.0 to 1.2.1

Change-Id: I92adbaf3924f3d9eca9e6c4029e8f17dec143e26
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/ResmanagementService/deployment/pom.xml b/ResmanagementService/deployment/pom.xml
index 9f3aca2..ec20c04 100644 (file)
--- a/ResmanagementService/deployment/pom.xml
+++ b/ResmanagementService/deployment/pom.xml
@@ -19,10 +19,10 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <artifactId>vfc-nfvo-resmanagement-deployment</artifactId>
     <packaging>pom</packaging>
 

diff --git a/ResmanagementService/docker/Dockerfile b/ResmanagementService/docker/Dockerfile
index bfd653a..e2097cc 100644 (file)
--- a/ResmanagementService/docker/Dockerfile
+++ b/ResmanagementService/docker/Dockerfile
@@ -40,7 +40,7 @@ ENV CATALINA_HOME /service
 
 # Set up microservice
 
-RUN wget -q -O nfvo-resmanagement.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.resmanagement&a=vfc-nfvo-resmanagement-deployment&v=LATEST&e=zip" && unzip -q -o -B nfvo-resmanagement.zip && rm -f nfvo-resmanagement.zip
+RUN wget -q -O nfvo-resmanagement.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.resmanagement&a=vfc-nfvo-resmanagement-deployment&v=LATEST&e=zip" && unzip -q -o -B nfvo-resmanagement.zip && rm -f nfvo-resmanagement.zip
 # Set permissions
 RUN find . -type d -exec chmod o-w {} \;
 RUN find . -name "*.sh" -exec chmod +x {} \;

diff --git a/ResmanagementService/docker/build_image.sh b/ResmanagementService/docker/build_image.sh
index 391e598..41ad04e 100644 (file)
--- a/ResmanagementService/docker/build_image.sh
+++ b/ResmanagementService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.2.0"
+VERSION="1.2.1"
 PROJECT="vfc"
 IMAGE="resmanagement"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/ResmanagementService/pom.xml b/ResmanagementService/pom.xml
index 86b44cc..8f18442 100644 (file)
--- a/ResmanagementService/pom.xml
+++ b/ResmanagementService/pom.xml
@@ -19,11 +19,11 @@
         <parent>
         <artifactId>vfc-nfvo-resmanagement</artifactId>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService</name>
     <packaging>pom</packaging>
 

diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml
index e75702b..3e043b7 100644 (file)
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>vfc-nfvo-resmanagement-service</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService/service</name>
     <packaging>war</packaging>
     <dependencies>

diff --git a/pom.xml b/pom.xml
index 7090039..48f778d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
     <artifactId>vfc-nfvo-resmanagement</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-resmanagement</name>
     <description>vfc nfvo resmanagement</description>

diff --git a/version.properties b/version.properties
index d467a57..4102e06 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 \r
 major=1\r
 minor=2\r
-patch=0\r
+patch=1\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r