diff options
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService')
4 files changed, 6 insertions, 2 deletions
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 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <java.version>11</java.version> </properties> <build> 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 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <package.name>vnfmadapter-service</package.name> + <java.version>11</java.version> </properties> <modules> 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 @@ <artifactId>vnfmadapter-service</artifactId> <name>vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService/service</name> <packaging>war</packaging> - + <properties> + <java.version>11</java.version> + </properties> <dependencies> <dependency> <groupId>org.powermock</groupId> |