summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--huawei/pom.xml3
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml1
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh2
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/pom.xml1
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/pom.xml4
-rw-r--r--huawei/vnfmadapter/pom.xml11
6 files changed, 15 insertions, 7 deletions
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 @@
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm-huawei</name>
<description>vfc-nfvo-driver-vnfm-svnfm-huawei</description>
+ <properties>
+ <java.version>11</java.version>
+ </properties>
<modules>
<module>vnfmadapter</module>
</modules>
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>
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 @@
<description>nfvo vnfmadapter</description>
<properties>
<packagename>VnfmadapterService</packagename>
- <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
- <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
- <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
- <sonar.projectVersion>${project.version}</sonar.projectVersion>
- <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+ <java.version>11</java.version>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
+ <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
</properties>
<modules>
<module>VnfmadapterService</module>