From d786a6d6b60d25fab153e5fcca8432c803456ed5 Mon Sep 17 00:00:00 2001 From: yangyan Date: Fri, 25 Jan 2019 10:09:09 +0800 Subject: update vfc version to 1.3.30 Change-Id: I62a2974154fab6d8cb26740610d734cb5a1f886a Signed-off-by: yangyan Issue-ID: VFC-1252 --- INFO.yaml | 26 ++++++++++++++++---------- ResmanagementService/deployment/pom.xml | 4 ++-- ResmanagementService/docker/build_image.sh | 2 +- ResmanagementService/pom.xml | 4 ++-- ResmanagementService/service/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 4 ++-- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index 07f4c32..4fbe669 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,22 @@ 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/ResmanagementService/deployment/pom.xml b/ResmanagementService/deployment/pom.xml index 7f2d6b2..9d6325f 100644 --- a/ResmanagementService/deployment/pom.xml +++ b/ResmanagementService/deployment/pom.xml @@ -19,10 +19,10 @@ org.onap.vfc.nfvo.resmanagement vfc-nfvo-resmanagement-service-root - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT ../pom.xml - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vfc-nfvo-resmanagement-deployment pom diff --git a/ResmanagementService/docker/build_image.sh b/ResmanagementService/docker/build_image.sh index 41e6dce..7cc91f8 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.2.2" +VERSION="1.3.0" PROJECT="vfc" IMAGE="resmanagement" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/ResmanagementService/pom.xml b/ResmanagementService/pom.xml index 78b2eeb..80dc20b 100644 --- a/ResmanagementService/pom.xml +++ b/ResmanagementService/pom.xml @@ -19,11 +19,11 @@ vfc-nfvo-resmanagement org.onap.vfc.nfvo.resmanagement - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT ../pom.xml vfc-nfvo-resmanagement-service-root - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vfc/nfvo/resmanagement/ResmanagementService pom diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml index ca57ab6..b64e50a 100644 --- a/ResmanagementService/service/pom.xml +++ b/ResmanagementService/service/pom.xml @@ -20,12 +20,12 @@ org.onap.vfc.nfvo.resmanagement vfc-nfvo-resmanagement-service-root - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT ../pom.xml vfc-nfvo-resmanagement-service - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT vfc/nfvo/resmanagement/ResmanagementService/service war diff --git a/pom.xml b/pom.xml index ba24ac2..d4651fb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.vfc.nfvo.resmanagement vfc-nfvo-resmanagement - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-resmanagement vfc nfvo resmanagement diff --git a/version.properties b/version.properties index 80d2dbd..864741a 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,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} -- cgit 1.2.3-korg