diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-08-31 13:49:55 +0000 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-08-31 13:49:55 +0000 |
| commit | daa8ee351d6743396e2024872a5d49cc328f4c9b (patch) | |
| tree | 2393e6beefbc8cd4c1a69365206b4910cfea8e7d | |
| parent | d6bdee63e34e42350024cd805bb1213bc563fceb (diff) | |
Use Java 11 base docker image
Update Sodium image to use java 11. Also, update platform logic installer
to install JAXB implementation libraries.
Issue-ID: CCSDK-2710
Issue-ID: CCSDK-2485
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I2f2e6880464125dba37e2dd444e8a757bdfdd956
| -rw-r--r-- | opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | platform-logic/installer/pom.xml | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile index 8710453d..ba64a4b7 100644 --- a/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile +++ b/opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/ccsdk-alpine-image:${project.docker.latestfulltag.version} +FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) ENV ODL_HOME /opt/opendaylight/current diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 31abfc87..187c721f 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -61,6 +61,19 @@ <artifactId>mariadb-java-client</artifactId> <version>${mariadb.connector.version}</version> </dependency> + <!-- Java 11 : need to install JAXB implementation libraries--> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> </dependencies> <build> |