Unified vfc-vnflcm master version

Change-Id: Ib01b28537f72abdf53fe42255e0f4cae7c5ea324
Issue-ID: VFC-625
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile
index 5d26454..05ef5a5 100755 (executable)
--- a/lcm/docker/Dockerfile
+++ b/lcm/docker/Dockerfile
@@ -30,12 +30,12 @@ ADD . /service
 WORKDIR /service
 
 # get binary zip from nexus
-RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip' && \
     unzip vfc-gvnfm-vnflcm-lcm.zip && \
     rm -rf vfc-gvnfm-vnflcm-lcm.zip
 
 # get db scripts from nexus
-RUN wget -q -O vfc-gvnfm-vnfres-res.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-gvnfm-vnfres-res.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.gvnfm.vnfres.res&a=vfc-gvnfm-vnfres-res&v=LATEST&e=zip' && \
     unzip vfc-gvnfm-vnfres-res.zip vfc/gvnfm/vnfres/res/assembly/*.* && \
     mv ./vfc/gvnfm/vnfres/res/assembly/bin ./bin && \
     mv ./vfc/gvnfm/vnfres/res/assembly/dbscripts ./dbscripts && \

diff --git a/lcm/docker/build_image.sh b/lcm/docker/build_image.sh
index 4541973..39d748e 100755 (executable)
--- a/lcm/docker/build_image.sh
+++ b/lcm/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.0.1"
+VERSION="1.1.0"
 PROJECT="vfc"
 IMAGE="vnflcm"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/version.properties b/version.properties
index 3e4a550..d7c69cd 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=1
-patch=1
+patch=0
 
 base_version=${major}.${minor}.${patch}