From: luxin <luxin7@huawei.com>
Date: Wed, 20 Dec 2017 06:42:13 +0000 (+0800)
Subject: Update VFC version number
X-Git-Tag: v1.1.0~58
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b1fc9d5fdea86240f72ed31227ae4a6d24f33b9b;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fgvnfm.git

Update VFC version number

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

diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/Dockerfile b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/Dockerfile
index af1ccff..b7b52aa 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/Dockerfile
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/Dockerfile
@@ -24,12 +24,11 @@ RUN echo 'export CATALINA_OPTS="$CATALINA_OPTS -Xms64m -Xmx256m -XX:MaxPermSize=
 ENV CATALINA_HOME /service
 
 # Set up microservice
-RUN wget -q -O vfc-gvnfm-jujudriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm&a=juju-vnfmadapterservice-deployment&v=LATEST&e=zip" && unzip -q -o -B vfc-gvnfm-jujudriver.zip && rm -f vfc-gvnfm-jujudriver.zip
+RUN wget -q -O vfc-gvnfm-jujudriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm&a=juju-vnfmadapterservice-deployment&v=LATEST&e=zip" && unzip -q -o -B vfc-gvnfm-jujudriver.zip && rm -f vfc-gvnfm-jujudriver.zip
 # Set permissions
 RUN find . -type d -exec chmod o-w {} \;
 RUN find . -name "*.sh" -exec chmod +x {} \;
 EXPOSE 8483
-RUN echo ONAP vfc-gvnfm-jujudriver 1.0.0-SNAPSHOT "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm&a=juju-vnfmadapterservice-deployment&v=LATEST&e=zip" > ONAP_VERSION
 
 # 90-entrypoint.txt
 RUN yum clean all
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
index addfcb9..24488b5 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.0.0"
+VERSION="1.1.0"
 PROJECT="vfc"
 IMAGE="jujudriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/version.properties b/version.properties
index 3e4a550..d7c69cd 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=1
-patch=1
+patch=0
 
 base_version=${major}.${minor}.${patch}