diff options
| author |   Bogumil Zebek <bogumil.zebek@nokia.com> | 2020-04-22 05:32:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-22 05:32:03 +0000 |
| commit | 6528bdf36e6eee2aae7f4a83395821c13619c6bb (patch) | |
| tree | 0eff0d88c1a6f088d615d7c8c1e782f7fdc0931e | |
| parent | f639063656259cc9923c51179e8f5714a315cb89 (diff) | |
| parent | c8cfd07b8cf618137b04d1fe2c6779c6cf3a10bf (diff) | |
Merge "Update java to version 11"
| -rw-r--r-- | netconfsimulator/Dockerfile_app | 2 | ||||
| -rw-r--r-- | netconfsimulator/pom.xml | 4 | ||||
| -rw-r--r-- | pnfsimulator/Dockerfile | 2 | ||||
| -rw-r--r-- | pnfsimulator/integration/pom.xml | 4 | ||||
| -rw-r--r-- | pnfsimulator/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/netconfsimulator/Dockerfile_app b/netconfsimulator/Dockerfile_app index 589be17..d1cc447 100644 --- a/netconfsimulator/Dockerfile_app +++ b/netconfsimulator/Dockerfile_app @@ -1,4 +1,4 @@ -FROM docker.io/openjdk:8-jre-alpine +FROM docker.io/openjdk:11-jre-slim ARG VERSION=${version} diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml index 86f3ecd..6dbdf0c 100644 --- a/netconfsimulator/pom.xml +++ b/netconfsimulator/pom.xml @@ -35,8 +35,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <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> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> <docker.registry>nexus3.onap.org:10003</docker.registry> <docker.image.tag>latest</docker.image.tag> diff --git a/pnfsimulator/Dockerfile b/pnfsimulator/Dockerfile index 7cadcf4..52e507c 100644 --- a/pnfsimulator/Dockerfile +++ b/pnfsimulator/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/openjdk:8-jre-alpine +FROM docker.io/openjdk:11-jre-slim ARG VERSION=${version} diff --git a/pnfsimulator/integration/pom.xml b/pnfsimulator/integration/pom.xml index e411735..5b8e738 100644 --- a/pnfsimulator/integration/pom.xml +++ b/pnfsimulator/integration/pom.xml @@ -39,8 +39,8 @@ </repositories> <properties> - <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> </properties> <dependencies> diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml index 251feb2..436571d 100644 --- a/pnfsimulator/pom.xml +++ b/pnfsimulator/pom.xml @@ -37,8 +37,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <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> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class> <docker.image.tag>latest</docker.image.tag> @@ -46,8 +46,8 @@ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <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> <docker-maven-plugin.version>0.31.0</docker-maven-plugin.version> <skipDockerPush>true</skipDockerPush> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml |