From c9c7a0aa3d74011b614bf7a53f7c55a89df3ebd8 Mon Sep 17 00:00:00 2001 From: "mukesh.paliwal1@huawei.com" Date: Tue, 21 Jul 2020 15:31:42 +0530 Subject: REQ-351 upgrade to Java 11 Issue-ID: VFC-1703 Signed-off-by: mukesh.paliwal1@huawei.com Change-Id: I7697506854d1e50e6739e82503974f3e26df8c9f --- huawei/pom.xml | 3 +++ huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml | 1 + .../VnfmadapterService/docker/docker-env-config.sh | 2 +- huawei/vnfmadapter/VnfmadapterService/pom.xml | 1 + huawei/vnfmadapter/VnfmadapterService/service/pom.xml | 4 +++- huawei/vnfmadapter/pom.xml | 11 ++++++----- 6 files changed, 15 insertions(+), 7 deletions(-) (limited to 'huawei') diff --git a/huawei/pom.xml b/huawei/pom.xml index 3946f7aa..871b6de7 100644 --- a/huawei/pom.xml +++ b/huawei/pom.xml @@ -27,6 +27,9 @@ pom vfc-nfvo-driver-vnfm-svnfm-huawei vfc-nfvo-driver-vnfm-svnfm-huawei + + 11 + vnfmadapter diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml index 2cc3f18d..16cb1929 100644 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml @@ -27,6 +27,7 @@ UTF-8 + 11 diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh b/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh index 94d71f2a..7c4d235a 100644 --- a/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh +++ b/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh @@ -10,7 +10,7 @@ set_up_mysql_jdk(){ sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo yum -y update - yum -y install wget unzip socat java-1.8.0-openjdk-headless + yum -y install wget unzip socat java-11-openjdk-headless sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security # Set up mysql diff --git a/huawei/vnfmadapter/VnfmadapterService/pom.xml b/huawei/vnfmadapter/VnfmadapterService/pom.xml index c869402b..4a85a6a0 100644 --- a/huawei/vnfmadapter/VnfmadapterService/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/pom.xml @@ -29,6 +29,7 @@ UTF-8 vnfmadapter-service + 11 diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml index f0a99945..61d685e6 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml @@ -26,7 +26,9 @@ vnfmadapter-service vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService/service war - + + 11 + org.powermock diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml index 2f871949..df8601f6 100644 --- a/huawei/vnfmadapter/pom.xml +++ b/huawei/vnfmadapter/pom.xml @@ -29,11 +29,12 @@ nfvo vnfmadapter VnfmadapterService - ${project.build.directory}/surefire-reports - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - true - ${project.version} - reuseReports + 11 + ${project.build.directory}/surefire-reports + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + true + ${project.version} + reuseReports VnfmadapterService -- cgit 1.2.3-korg