diff options
| author |   Krzysztof Gajewski <krzysztof.gajewski@nokia.com> | 2020-08-07 09:32:55 +0200 |
|---|---|---|
| committer | Krzysztof Gajewski <krzysztof.gajewski@nokia.com> | 2020-08-07 10:15:58 +0200 |
| commit | 5fb7cbb6997a8548597f617438de819d20200073 (patch) | |
| tree | 54bd5f3e1b8e25485dc0877ea4197ba7310d2602 | |
| parent | ba3d7306c1773ea78ad7a87468fc66b9b4f18551 (diff) | |
dcaegen2/platform - mod/runtimeAPI java11 upgrade
Change-Id: I6a23640244b388272e12b9883a42797371f5ecec
Issue-ID: DCAEGEN2-2288
Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>, Jerzy Szachniewicz <jerzy.szachniewicz@nokia.com>
| -rw-r--r-- | mod/runtimeapi/pom.xml | 27 | ||||
| -rw-r--r-- | mod/runtimeapi/runtime-web/pom.xml | 4 |
2 files changed, 25 insertions, 6 deletions
diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml index f9919c5..3e95c7f 100644 --- a/mod/runtimeapi/pom.xml +++ b/mod/runtimeapi/pom.xml @@ -36,15 +36,34 @@ limitations under the License. <name>dcaegen2-platform-mod-runtimeapi</name> <description>MOD Runtime API</description> <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.deploy.skip>true</maven.deploy.skip> - <java.version>1.8</java.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml </sonar.coverage.jacoco.xmlReportPaths> </properties> + <profiles> + <profile> + <id>java11</id> + <properties> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.release>11</maven.compiler.release> + </properties> + <activation> + <property> + <name>m2e.version</name> + </property> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>java8</id> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + </profile> + </profiles> <build> <plugins> diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml index 3582c94..7404dde 100644 --- a/mod/runtimeapi/runtime-web/pom.xml +++ b/mod/runtimeapi/runtime-web/pom.xml @@ -109,7 +109,7 @@ limitations under the License. <name>onap/${project.groupId}.${project.artifactId}</name> <registry>${onap.nexus.dockerregistry.daily}</registry> <build> - <from>openjdk:8-jre-alpine</from> + <from>openjdk:11-jre-slim</from> <tags> <tag>latest</tag> <tag>${project.version}</tag> @@ -119,7 +119,7 @@ limitations under the License. <descriptorRef>artifact</descriptorRef> </assembly> <runCmds> - <runCmd>addgroup -g 1000 dcaemod && adduser -s /bin/bash -u 1000 -G dcaemod -D dcaemod && mkdir -p /maven/data && chown -R dcaemod:dcaemod /maven/data</runCmd> + <runCmd>groupadd -r dcaemod && useradd -ms /bin/bash dcaemod -g dcaemod && mkdir -p /maven/data && chown -R dcaemod:dcaemod /maven/data</runCmd> </runCmds> <workdir>/maven</workdir> <volumes> |