From 43fa14628bf3d741c551dc6cbfe2e6cbb7647273 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Thu, 8 Nov 2018 09:59:09 +0800 Subject: Update version from 1.2.0 to 1.2.1 Change-Id: I203dba184b5eaad855bf350c443c180850ea47fc Issue-ID: VFC-1163 Signed-off-by: fujinhua --- huawei/pom.xml | 4 ++-- huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml | 2 +- huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh | 2 +- huawei/vnfmadapter/VnfmadapterService/pom.xml | 4 ++-- huawei/vnfmadapter/VnfmadapterService/service/pom.xml | 2 +- huawei/vnfmadapter/pom.xml | 4 ++-- nokia/pom.xml | 4 ++-- nokia/vnfmdriver/pom.xml | 4 ++-- nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml | 2 +- nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh | 2 +- nokia/vnfmdriver/vfcadaptorservice/pom.xml | 4 ++-- nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml | 4 ++-- nokiav2/deployment/pom.xml | 4 ++-- nokiav2/driver/pom.xml | 6 +++--- nokiav2/driverwar/pom.xml | 6 +++--- nokiav2/generatedapis/pom.xml | 4 ++-- nokiav2/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 2 +- zte/pom.xml | 4 ++-- zte/vmanager/docker/Dockerfile | 2 +- zte/vmanager/docker/build_image.sh | 2 +- zte/vmanager/pom.xml | 4 ++-- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/huawei/pom.xml b/huawei/pom.xml index 621b37da..e771ae0c 100644 --- a/huawei/pom.xml +++ b/huawei/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm vfc-nfvo-driver-vnfm-svnfm - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei vfc-nfvo-driver-vnfm-svnfm-huawei - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-huawei vfc-nfvo-driver-vnfm-svnfm-huawei diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml index 79dd488a..092bd2fb 100644 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml @@ -19,7 +19,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter vnfmadapter-service-root - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT hw-vnfmadapter-deployment diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh index a5e6adb0..fe0260a5 100755 --- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh +++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.2.0" +VERSION="1.3.1" PROJECT="vfc" IMAGE="nfvo/svnfm/huawei" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/huawei/vnfmadapter/VnfmadapterService/pom.xml b/huawei/vnfmadapter/VnfmadapterService/pom.xml index ce2f3a66..6a2f9152 100644 --- a/huawei/vnfmadapter/VnfmadapterService/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/pom.xml @@ -19,10 +19,10 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter vnfmadapter - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT vnfmadapter-service-root - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService pom diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml index fc9b838d..7a409e13 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml @@ -20,7 +20,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter vnfmadapter-service-root - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT vnfmadapter-service diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml index 8f8e58a6..9aa7bae9 100644 --- a/huawei/vnfmadapter/pom.xml +++ b/huawei/vnfmadapter/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei vfc-nfvo-driver-vnfm-svnfm-huawei - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter vnfmadapter - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm nfvo vnfmadapter diff --git a/nokia/pom.xml b/nokia/pom.xml index 659cc622..507b2033 100644 --- a/nokia/pom.xml +++ b/nokia/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm vfc-nfvo-driver-vnfm-svnfm - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia vfc-nfvo-driver-vnfm-svnfm-nokia - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-nokia vfc-nfvo-driver-vnfm-svnfm-nokia diff --git a/nokia/vnfmdriver/pom.xml b/nokia/vnfmdriver/pom.xml index 7982c891..8245a88a 100644 --- a/nokia/vnfmdriver/pom.xml +++ b/nokia/vnfmdriver/pom.xml @@ -19,12 +19,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia vfc-nfvo-driver-vnfm-svnfm-nokia - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm vnfmdriver - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-nokia-vnfmdriver nfvo vnfmdriver diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml index 8db61235..014a0207 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml @@ -19,7 +19,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm vfcadaptor-service - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT vfcadaptor-deployment diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh index ca1bdb02..a3c0a45b 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh @@ -22,7 +22,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.1.0" +VERSION="1.3.1" PROJECT="vfc" IMAGE="nfvo/svnfm/nokia" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/nokia/vnfmdriver/vfcadaptorservice/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/pom.xml index 13110a76..83b8f8f9 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/pom.xml @@ -19,12 +19,12 @@ vnfmdriver org.onap.vfc.nfvo.driver.vnfm.svnfm - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.vfc.nfvo.driver.vnfm.svnfm vfcadaptor-service - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT vfc/nfvo/driver/vnfm/svnfm/nokia/vnfmdriver/vfcadaptorservice pom diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml index 283a2cc3..4e608aaa 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml @@ -18,7 +18,7 @@ 4.0.0 vfcadaptor - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT war vfc/nfvo/driver/vnfm/svnfm/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor @@ -27,7 +27,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm vfcadaptor-service - 1.1.0-SNAPSHOT + 1.3.1-SNAPSHOT diff --git a/nokiav2/deployment/pom.xml b/nokiav2/deployment/pom.xml index 6bb5ef87..6622a2f4 100644 --- a/nokiav2/deployment/pom.xml +++ b/nokiav2/deployment/pom.xml @@ -17,14 +17,14 @@ 4.0.0 deployment - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc/nfvo/driver/vnfm/svnfm/nokiav2/deployment Nokia SVNFM driver deployment files org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2 - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml index 17fdef06..abaef174 100644 --- a/nokiav2/driver/pom.xml +++ b/nokiav2/driver/pom.xml @@ -17,14 +17,14 @@ 4.0.0 driver - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT jar vfc/nfvo/driver/vnfm/svnfm/nokiav2/driver svnfm vnfm driver org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2 - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT UTF-8 @@ -35,7 +35,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.springframework.boot diff --git a/nokiav2/driverwar/pom.xml b/nokiav2/driverwar/pom.xml index f375b7ff..5742cc76 100644 --- a/nokiav2/driverwar/pom.xml +++ b/nokiav2/driverwar/pom.xml @@ -18,14 +18,14 @@ 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 driverwar - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT war vfc/nfvo/driver/vnfm/svnfm/nokiav2/driverwar svnfm vnfm driver org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2 - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT UTF-8 @@ -36,7 +36,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 driver - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.springframework.boot diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml index c391f3d9..7a7c5eb5 100644 --- a/nokiav2/generatedapis/pom.xml +++ b/nokiav2/generatedapis/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2 - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT jar vfc/nfvo/driver/vnfm/svnfm/nokiav2/generatedapis diff --git a/nokiav2/pom.xml b/nokiav2/pom.xml index fb29a80e..e9dfd789 100644 --- a/nokiav2/pom.xml +++ b/nokiav2/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm vfc-nfvo-driver-vnfm-svnfm - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2 - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-nokiav2 diff --git a/pom.xml b/pom.xml index 355e9308..870cf701 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm vfc-nfvo-driver-vnfm-svnfm - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm vfc-nfvo-driver-vnfm-svnfm diff --git a/version.properties b/version.properties index 75e785ba..3566fa0a 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} diff --git a/zte/pom.xml b/zte/pom.xml index c5702e8d..449b006b 100644 --- a/zte/pom.xml +++ b/zte/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm vfc-nfvo-driver-vnfm-svnfm - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.zte vfc-nfvo-driver-vnfm-svnfm-zte - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc/nfvo/driver/vnfm/svnfm/zte vfc-nfvo-driver-vnfm-svnfm-zte diff --git a/zte/vmanager/docker/Dockerfile b/zte/vmanager/docker/Dockerfile index 1057063f..4b1d4b41 100644 --- a/zte/vmanager/docker/Dockerfile +++ b/zte/vmanager/docker/Dockerfile @@ -26,7 +26,7 @@ ADD . /service WORKDIR /service # get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager -RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=LATEST&e=zip' && \ +RUN wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=LATEST&e=zip' && \ unzip vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip && \ rm -rf vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh index 88385bc6..27d42e96 100755 --- a/zte/vmanager/docker/build_image.sh +++ b/zte/vmanager/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.2.0" +VERSION="1.3.1" PROJECT="vfc" IMAGE="ztevnfmdriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/zte/vmanager/pom.xml b/zte/vmanager/pom.xml index 75e3ba4f..b4cf94f9 100644 --- a/zte/vmanager/pom.xml +++ b/zte/vmanager/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.zte vfc-nfvo-driver-vnfm-svnfm-zte - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager vfc-nfvo-driver-vnfm-svnfm-zte-vmanager - 1.2.0-SNAPSHOT + 1.3.1-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-zte -- cgit 1.2.3-korg