diff options
23 files changed, 40 insertions, 42 deletions
diff --git a/huawei/pom.xml b/huawei/pom.xml index 2be14df9..e771ae0c 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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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 cba3200b..092bd2fb 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.3.0-SNAPSHOT</version> + <version>1.3.1-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 23ba7341..f7fffc44 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.3.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 6a4cbbf1..6a2f9152 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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>vnfmadapter-service-root</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-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 7c3c8632..e1f54e37 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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <artifactId>vnfmadapter-service</artifactId> diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java index 9cf2b2ac..8fd3fbeb 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java @@ -78,12 +78,10 @@ public class ConnectMgrVnfm { ConnectInfo info = new ConnectInfo(vnfmObj.getString("url"), vnfmObj.getString(Constant.USERNAME), vnfmObj.getString(Constant.PASSWORD), authModel); - CloseableHttpClient httpClient = HttpClients.createDefault(); - - try { + try (CloseableHttpClient httpClient = HttpClients.createDefault()) { HttpPost httpPost = new HttpPost(info.getUrl()); } catch (Exception e) { - e.printStackTrace(); + LOG.error("Exception while creating connection: {}", e.getMessage()); } return 1; diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml index c66e2ac5..9aa7bae9 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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId> <artifactId>vnfmadapter</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-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 4662f00d..507b2033 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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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 24d8e181..8245a88a 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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vnfmdriver</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-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 8d62c8aa..014a0207 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.3.0-SNAPSHOT</version> + <version>1.3.1-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 6e4e642b..27838975 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.3.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 c3470c01..83b8f8f9 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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId> <artifactId>vfcadaptor-service</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-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 dfbdfde3..4e608aaa 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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <properties> 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 @@ <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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <build> <plugins> 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 @@ <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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>driverwar</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> 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 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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 9c44a1ca..527e1890 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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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 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 35d79131..449b006b 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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-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 739d8f13..f692457a 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.3.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 f22f732c..b4cf94f9 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.3.0-SNAPSHOT</version> + <version>1.3.1-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.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-svnfm-zte</name> <properties> |