From: luxin <luxin7@huawei.com>
Date: Tue, 19 Dec 2017 12:49:02 +0000 (+0800)
Subject: Update VFC version number
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F26543%2F1;p=vfc%2Fnfvo%2Fresmanagement.git

Update VFC version number

Change-Id: I295c2dd348bc24c6aaf5875c93744d9645a4d531
Issue-ID: VFC-624
Signed-off-by: luxin <luxin7@huawei.com>
---

diff --git a/ResmanagementService/deployment/pom.xml b/ResmanagementService/deployment/pom.xml
index e569afd..d016711 100644
--- 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.1.1-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <artifactId>vfc-nfvo-resmanagement-deployment</artifactId>
     <packaging>pom</packaging>
 
diff --git a/ResmanagementService/deployment/version.properties b/ResmanagementService/deployment/version.properties
deleted file mode 100644
index 0a53751..0000000
--- a/ResmanagementService/deployment/version.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################################################
-# Versioning variables
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
-# because they are used in Jenkins, whose plug-in doesn't support
-
-major=1
-minor=0
-patch=0
-
-base_version=${major}.${minor}.${patch}
-
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
diff --git a/ResmanagementService/docker/Dockerfile b/ResmanagementService/docker/Dockerfile
index b706a59..29c1ac9 100644
--- a/ResmanagementService/docker/Dockerfile
+++ b/ResmanagementService/docker/Dockerfile
@@ -36,14 +36,12 @@ ENV CATALINA_HOME /service
 # 50-microservice.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY
 
 # Set up microservice
-# 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
-RUN wget -q -O nfvo-resmanagement-1.0.0-SNAPSHOT.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-1.0.0-SNAPSHOT.zip && rm -f nfvo-resmanagement-1.0.0-SNAPSHOT.zip
+
+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=1.0.1&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 {} \;
 EXPOSE 8480
-RUN echo ONAP nfvo-resmanagement 1.0.0-SNAPSHOT "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" > OPENO_VERSION
-
 
 # 90-entrypoint.txt
 
diff --git a/ResmanagementService/docker/build_image.sh b/ResmanagementService/docker/build_image.sh
index 633d4c1..85ce03a 100644
--- 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.0.0"
+VERSION="1.0.1"
 PROJECT="vfc"
 IMAGE="resmanagement"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/ResmanagementService/pom.xml b/ResmanagementService/pom.xml
index f4c1d39..55a6b56 100644
--- 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.1.1-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.0.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 85eae82..c2f0d2f 100644
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>vfc-nfvo-resmanagement-service-root</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>vfc-nfvo-resmanagement-service</artifactId>
-     <version>1.1.1-SNAPSHOT</version>
+     <version>1.0.1-SNAPSHOT</version>
     <name>vfc/nfvo/resmanagement/ResmanagementService/service</name>
     <packaging>war</packaging>
     <dependencies>
diff --git a/ResmanagementService/service/version.properties b/ResmanagementService/service/version.properties
deleted file mode 100644
index 0a53751..0000000
--- a/ResmanagementService/service/version.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################################################
-# Versioning variables
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
-# because they are used in Jenkins, whose plug-in doesn't support
-
-major=1
-minor=0
-patch=0
-
-base_version=${major}.${minor}.${patch}
-
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
diff --git a/ResmanagementService/version.properties b/ResmanagementService/version.properties
deleted file mode 100644
index 0a53751..0000000
--- a/ResmanagementService/version.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################################################
-# Versioning variables
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
-# because they are used in Jenkins, whose plug-in doesn't support
-
-major=1
-minor=0
-patch=0
-
-base_version=${major}.${minor}.${patch}
-
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3b90d28..d1474f1 100644
--- 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.1.1-SNAPSHOT</version>
+    <version>1.0.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 010a2a5..829bd66 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
+minor=0
 patch=1
 
 base_version=${major}.${minor}.${patch}