diff options
-rw-r--r-- | INFO.yaml | 25 | ||||
-rw-r--r-- | huawei/pom.xml | 4 | ||||
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml | 2 | ||||
-rwxr-xr-x | huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh | 2 | ||||
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/pom.xml | 4 | ||||
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/service/pom.xml | 2 | ||||
-rw-r--r-- | huawei/vnfmadapter/pom.xml | 4 | ||||
-rw-r--r-- | nokia/pom.xml | 4 | ||||
-rw-r--r-- | nokia/vnfmdriver/pom.xml | 4 | ||||
-rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml | 2 | ||||
-rwxr-xr-x | nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh | 2 | ||||
-rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/pom.xml | 4 | ||||
-rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml | 4 | ||||
-rw-r--r-- | nokiav2/deployment/pom.xml | 4 | ||||
-rw-r--r-- | nokiav2/driver/pom.xml | 6 | ||||
-rw-r--r-- | nokiav2/driverwar/pom.xml | 6 | ||||
-rw-r--r-- | nokiav2/generatedapis/pom.xml | 4 | ||||
-rw-r--r-- | nokiav2/pom.xml | 4 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | version.properties | 4 | ||||
-rw-r--r-- | zte/pom.xml | 4 | ||||
-rwxr-xr-x | zte/vmanager/docker/build_image.sh | 2 | ||||
-rw-r--r-- | zte/vmanager/pom.xml | 4 |
23 files changed, 54 insertions, 49 deletions
@@ -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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-huawei</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm-huawei</name> <description>vfc-nfvo-driver-vnfm-svnfm-huawei</description> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId> <artifactId>vnfmadapter-service-root</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>hw-vnfmadapter-deployment</artifactId> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId> <artifactId>vnfmadapter</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>vnfmadapter-service-root</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <name>vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService</name> <packaging>pom</packaging> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId> <artifactId>vnfmadapter-service-root</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>vnfmadapter-service</artifactId> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-huawei</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId> <artifactId>vnfmadapter</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm</name> <description>nfvo vnfmadapter</description> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokia</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm-nokia</name> <description>vfc-nfvo-driver-vnfm-svnfm-nokia</description> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokia</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vnfmdriver</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm-nokia-vnfmdriver</name> <description>nfvo vnfmdriver</description> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfcadaptor-service</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>vfcadaptor-deployment</artifactId> 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 @@ <parent> <artifactId>vnfmdriver</artifactId> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfcadaptor-service</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <name>vfc/nfvo/driver/vnfm/svnfm/nokia/vnfmdriver/vfcadaptorservice</name> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> <artifactId>vfcadaptor</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>war</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor</name> @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfcadaptor-service</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <properties> 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 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>deployment</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/deployment</name> <description>Nokia SVNFM driver deployment files</description> <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <build> <plugins> 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 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>driver</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driver</name> <description>svnfm vnfm driver</description> <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -35,7 +35,7 @@ <dependency> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>driverwar</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>war</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driverwar</name> <description>svnfm vnfm driver</description> <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -36,7 +36,7 @@ <dependency> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>driver</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/generatedapis</name> <properties> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm-nokiav2</name> <properties> @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm</name> <description>vfc-nfvo-driver-vnfm-svnfm</description> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-zte</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/zte</name> <description>vfc-nfvo-driver-vnfm-svnfm-zte</description> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-zte</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-zte-vmanager</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm-zte</name> <properties> |