Merge "Rollback to JDK 11"

diff --git a/pom.xml b/pom.xml
index 4545974..83bc1d0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1174,8 +1174,8 @@
                                <artifactId>maven-compiler-plugin</artifactId>
                                <version>3.8.1</version>
                                <configuration>
-                                       <source>13</source>
-                                       <target>13</target>
+                                       <source>11</source>
+                                       <target>11</target>
                                </configuration>
                        </plugin>
                        <plugin>

diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile
index 625d5a9..776cc8c 100644 (file)
--- a/src/main/docker/backend/Dockerfile
+++ b/src/main/docker/backend/Dockerfile
@@ -21,7 +21,7 @@
 #\r
 ###\r
 \r
-FROM openjdk:13-alpine3.10\r
+FROM alpine:3.10\r
 \r
 MAINTAINER "The Onap Team"\r
 LABEL Description="This immage contains alpine, openjdk 11 and clamp"\r
@@ -33,6 +33,8 @@ ENV HTTPS_PROXY=$https_proxy
 ENV http_proxy=$HTTP_PROXY\r
 ENV https_proxy=$HTTPS_PROXY\r
 \r
+RUN apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community\r
+\r
 RUN addgroup onap && adduser -D -G onap clamp\r
 VOLUME /opt/clamp/config\r
 RUN mkdir /var/log/onap\r