From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 11 Feb 2021 15:19:42 +0000 (+0000)
Subject: Merge "Upgrade java version from 8 to 11 of so-simulator"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4fbb28749f57727dc23790b6e9ec480ca61490fb;hp=dfb812a05c8437665cc736e9fc856c8781fec894;p=integration%2Fcsit.git

Merge "Upgrade java version from 8 to 11 of so-simulator"
---

diff --git a/plans/so/integration-etsi-testing/so-simulators/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image b/plans/so/integration-etsi-testing/so-simulators/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image
index f227c63f..f954ea3b 100644
--- a/plans/so/integration-etsi-testing/so-simulators/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image
+++ b/plans/so/integration-etsi-testing/so-simulators/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image
@@ -1,4 +1,4 @@
-FROM docker.io/openjdk:8-jdk-alpine
+FROM adoptopenjdk/openjdk11:jre-11.0.9.1_1-alpine
 
 ARG http_proxy
 ARG https_proxy
diff --git a/plans/so/integration-etsi-testing/so-simulators/pom.xml b/plans/so/integration-etsi-testing/so-simulators/pom.xml
index 4be20c66..fb08bbb4 100644
--- a/plans/so/integration-etsi-testing/so-simulators/pom.xml
+++ b/plans/so/integration-etsi-testing/so-simulators/pom.xml
@@ -10,11 +10,11 @@
         <jax.ws.rs>2.1</jax.ws.rs>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <jaxb.version>2.3.0</jaxb.version>
         <javax.version>1.1.1</javax.version>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
     <modules>
         <module>common</module>