From cd12f7c1f7290858027822502c37296bdcef14e9 Mon Sep 17 00:00:00 2001 From: yangyan Date: Fri, 25 Jan 2019 10:02:54 +0800 Subject: [PATCH] update vfc version to 1.3.0 Change-Id: I2f23ccfe41fc227fafbfb0b5b2ce49671c0fca9a Signed-off-by: yangyan Issue-ID: VFC-1252 --- INFO.yaml | 25 +++++++++++++--------- huawei/pom.xml | 4 ++-- .../VnfmadapterService/deployment/pom.xml | 2 +- .../VnfmadapterService/docker/build_image.sh | 2 +- huawei/vnfmadapter/VnfmadapterService/pom.xml | 4 ++-- .../vnfmadapter/VnfmadapterService/service/pom.xml | 2 +- huawei/vnfmadapter/pom.xml | 4 ++-- nokia/pom.xml | 4 ++-- nokia/vnfmdriver/pom.xml | 4 ++-- .../vfcadaptorservice/deployment/pom.xml | 2 +- .../vfcadaptorservice/docker/build_image.sh | 2 +- nokia/vnfmdriver/vfcadaptorservice/pom.xml | 4 ++-- .../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 | 4 ++-- zte/pom.xml | 4 ++-- zte/vmanager/docker/build_image.sh | 2 +- zte/vmanager/pom.xml | 4 ++-- 23 files changed, 54 insertions(+), 49 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index 20442214..4df772db 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -88,11 +88,6 @@ committers: company: 'Boco' id: 'Wang_Guirong' timezone: 'Asia/Shanghai' - - name: 'Xiaodong Ning' - email: 'ningxiaodong2017@boco.com.cn' - company: 'Boco' - id: 'ningxiaodong2017' - timezone: 'Asia/Shanghai' - name: 'Adityakar Jha' email: 'Adityakar.Jha@ril.com' company: 'Ril' @@ -103,11 +98,6 @@ committers: company: 'Raisecom' id: 'donghu1102' timezone: 'Asia/Shanghai' - - name: 'Yufei Zhou' - email: 'yufei.zhou@nokia-sbell.com' - company: 'Nokia' - id: 'yufei_zhou' - timezone: 'Asia/Shanghai' - name: 'Denes Nemeth' email: 'denes.nemeth@nokia.com' company: 'Nokia' @@ -118,6 +108,21 @@ committers: company: 'Intel' id: 'haibin' timezone: 'Asia/Shanghai' + - name: 'LiLai' + email: 'lai.li@zte.com.cn' + company: 'ZTE' + id: 'laili' + timezone: 'Asia/Nanjing' + - name: 'Bharath Thiruveedula' + email: 'bharath.thiruveedula@verizon.com' + company: 'Verizon' + id: 'bharaththiruveedula' + timezone: 'Asia/Hyderabad' + - name: 'Ruoyu Ying' + email: 'ruoyu.ying@intel.com' + company: 'Intel' + id: 'Ruoyu' + timezone: 'Asia/ShangHai' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: diff --git a/huawei/pom.xml b/huawei/pom.xml index 5e2e27ad..2be14df9 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei vfc-nfvo-driver-vnfm-svnfm-huawei - 1.2.2-SNAPSHOT + 1.3.0-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 a4b02ca2..cba3200b 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.2-SNAPSHOT + 1.3.0-SNAPSHOT hw-vnfmadapter-deployment diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh index 3e20a133..23ba7341 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.2" +VERSION="1.3.0" 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 c1d58f8b..6a4cbbf1 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.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfmadapter-service-root - 1.2.2-SNAPSHOT + 1.3.0-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 9a968bc7..7b93c4de 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.2-SNAPSHOT + 1.3.0-SNAPSHOT vnfmadapter-service diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml index d7dad7d6..c66e2ac5 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.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter vnfmadapter - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm nfvo vnfmadapter diff --git a/nokia/pom.xml b/nokia/pom.xml index e18f2ace..4662f00d 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia vfc-nfvo-driver-vnfm-svnfm-nokia - 1.2.2-SNAPSHOT + 1.3.0-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 bdcbfd3c..24d8e181 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm vnfmdriver - 1.2.2-SNAPSHOT + 1.3.0-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 df3d071e..8d62c8aa 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vfcadaptor-deployment diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh index b9019d84..6e4e642b 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.2.2" +VERSION="1.3.0" 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 6ebd02ea..c3470c01 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.vfc.nfvo.driver.vnfm.svnfm vfcadaptor-service - 1.2.2-SNAPSHOT + 1.3.0-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 0f272ea6..dfbdfde3 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml @@ -18,7 +18,7 @@ 4.0.0 vfcadaptor - 1.2.2-SNAPSHOT + 1.3.0-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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/nokiav2/deployment/pom.xml b/nokiav2/deployment/pom.xml index 8d4639a0..6bb5ef87 100644 --- a/nokiav2/deployment/pom.xml +++ b/nokiav2/deployment/pom.xml @@ -17,14 +17,14 @@ 4.0.0 deployment - 1.2.2-SNAPSHOT + 1.3.0-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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml index d185a920..17fdef06 100644 --- a/nokiav2/driver/pom.xml +++ b/nokiav2/driver/pom.xml @@ -17,14 +17,14 @@ 4.0.0 driver - 1.2.2-SNAPSHOT + 1.3.0-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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT UTF-8 @@ -35,7 +35,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.springframework.boot diff --git a/nokiav2/driverwar/pom.xml b/nokiav2/driverwar/pom.xml index e49bcdf7..f375b7ff 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.2.2-SNAPSHOT + 1.3.0-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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT UTF-8 @@ -36,7 +36,7 @@ org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 driver - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.springframework.boot diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml index f302067b..c391f3d9 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT jar vfc/nfvo/driver/vnfm/svnfm/nokiav2/generatedapis diff --git a/nokiav2/pom.xml b/nokiav2/pom.xml index b362bc87..b9866a69 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 vfc-nfvo-driver-vnfm-svnfm-nokiav2 - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-nokiav2 diff --git a/pom.xml b/pom.xml index 121209ba..355e9308 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm vfc-nfvo-driver-vnfm-svnfm diff --git a/version.properties b/version.properties index 6d6c5813..75e785ba 100644 --- a/version.properties +++ b/version.properties @@ -18,8 +18,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=2 -patch=2 +minor=3 +patch=0 base_version=${major}.${minor}.${patch} diff --git a/zte/pom.xml b/zte/pom.xml index ece5f1d5..35d79131 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.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.zte vfc-nfvo-driver-vnfm-svnfm-zte - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc/nfvo/driver/vnfm/svnfm/zte vfc-nfvo-driver-vnfm-svnfm-zte diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh index b5971aa6..739d8f13 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.2" +VERSION="1.3.0" PROJECT="vfc" IMAGE="ztevnfmdriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/zte/vmanager/pom.xml b/zte/vmanager/pom.xml index 57af87a5..f22f732c 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.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager vfc-nfvo-driver-vnfm-svnfm-zte-vmanager - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-svnfm-zte -- 2.16.6