From 3a81613baa7d0e8ef4e5b8a7fe68deb76ce51b12 Mon Sep 17 00:00:00 2001 From: yangyan Date: Thu, 24 Jan 2019 16:15:42 +0800 Subject: [PATCH] update vfc version to 1.3.0 Change-Id: If67db85afcf943f689d491847ab1354fe95d7faf Signed-off-by: yangyan Issue-ID: VFC-1252 --- INFO.yaml | 26 +++++++++++++--------- gvnfmadapter/docker/build_image.sh | 2 +- gvnfmadapter/pom.xml | 4 ++-- .../Juju-vnfmadapterService/deployment/pom.xml | 2 +- .../Juju-vnfmadapterService/docker/build_image.sh | 2 +- .../Juju-vnfmadapterService/pom.xml | 2 +- .../Juju-vnfmadapterService/service/pom.xml | 2 +- juju/juju-vnfmadapter/pom.xml | 4 ++-- juju/pom.xml | 4 ++-- pom.xml | 2 +- version.properties | 4 ++-- 11 files changed, 30 insertions(+), 24 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index e37b58d..558e12c 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/gvnfmadapter/docker/build_image.sh b/gvnfmadapter/docker/build_image.sh index 7b52001..e4559ea 100755 --- a/gvnfmadapter/docker/build_image.sh +++ b/gvnfmadapter/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="gvnfmdriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/gvnfmadapter/pom.xml b/gvnfmadapter/pom.xml index c97ad16..7086d7d 100644 --- a/gvnfmadapter/pom.xml +++ b/gvnfmadapter/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.gvnfm vfc-nfvo-driver-vnfm-gvnfm - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml index db91137..44002a8 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml @@ -19,7 +19,7 @@ org.onap.vfc.nfvo.driver.vnfm.gvnfm juju-vnfmadapter-service-root - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT juju-vnfmadapterservice-deployment diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh index 8b1ef15..fe5e0cb 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.2.2" +VERSION="1.3.0" PROJECT="vfc" IMAGE="jujudriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml index 3df80c2..e459604 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml @@ -19,7 +19,7 @@ org.onap.vfc.nfvo.driver.vnfm.gvnfm juju-vnfmadapter - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT juju-vnfmadapter-service-root vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter-vnfmadapterService diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml index 8334792..3728790 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml @@ -20,7 +20,7 @@ org.onap.vfc.nfvo.driver.vnfm.gvnfm juju-vnfmadapter-service-root - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT juju-vnfmadapter-service diff --git a/juju/juju-vnfmadapter/pom.xml b/juju/juju-vnfmadapter/pom.xml index 3c39821..b3727f2 100644 --- a/juju/juju-vnfmadapter/pom.xml +++ b/juju/juju-vnfmadapter/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.gvnfm juju - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.vfc.nfvo.driver.vnfm.gvnfm 4.0.0 juju-vnfmadapter - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter nfvo juju-vnfmadapter diff --git a/juju/pom.xml b/juju/pom.xml index 4515cb9..2ca1c45 100644 --- a/juju/pom.xml +++ b/juju/pom.xml @@ -18,12 +18,12 @@ org.onap.vfc.nfvo.driver.vnfm.gvnfm vfc-nfvo-driver-vnfm-gvnfm - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.vfc.nfvo.driver.vnfm.gvnfm 4.0.0 juju - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-gvnfm-juju nfvo juju-vnfmadapter diff --git a/pom.xml b/pom.xml index 0f69606..3617049 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.vfc.nfvo.driver.vnfm.gvnfm vfc-nfvo-driver-vnfm-gvnfm - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT pom vfc-nfvo-driver-vnfm-gvnfm vfc nfvo drivers-vnfm-gvnfm diff --git a/version.properties b/version.properties index 6d6c581..75e785b 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} -- 2.16.6