aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2021-02-11 15:19:42 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-11 15:19:42 +0000
commit4fbb28749f57727dc23790b6e9ec480ca61490fb (patch)
tree5fe52af3dafac15a03cf1b2570b72d4827ca7bc9 /plans
parentdfb812a05c8437665cc736e9fc856c8781fec894 (diff)
parent3c6eaa97cd1cc1f2eaff66e04232af5e3268d847 (diff)
Merge "Upgrade java version from 8 to 11 of so-simulator"
Diffstat (limited to 'plans')
-rw-r--r--plans/so/integration-etsi-testing/so-simulators/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image2
-rw-r--r--plans/so/integration-etsi-testing/so-simulators/pom.xml6
2 files changed, 4 insertions, 4 deletions
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>