From: xuegao <xg353y@intl.att.com>
Date: Fri, 18 Sep 2020 08:22:19 +0000 (+0200)
Subject: Upgrade to java 11
X-Git-Tag: 1.7.0^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F112875%2F2;p=sdc%2Fsdc-workflow-designer.git

Upgrade to java 11

Update WFD from java 8 to java 11.

Issue-ID: SDC-3283
Change-Id: I7d87779d33771e572a98a60c663e192b2be7eaa1
Signed-off-by: xuegao <xg353y@intl.att.com>
---

diff --git a/sdc-workflow-designer-be/docker/Dockerfile b/sdc-workflow-designer-be/docker/Dockerfile
index 91a5e78b..1aaf4b69 100644
--- a/sdc-workflow-designer-be/docker/Dockerfile
+++ b/sdc-workflow-designer-be/docker/Dockerfile
@@ -1,22 +1,20 @@
-FROM openjdk:8-jdk-alpine
+FROM onap/integration-java11:7.1.0
 
 EXPOSE 8080
 
-USER root 
-RUN addgroup -g 1000 sdc && adduser -S -u 1000 -G sdc -s /bin/sh sdc
-
+USER root
 ARG ARTIFACT
 
-ADD --chown=sdc:sdc ${ARTIFACT} /app.jar
+ADD --chown=onap:onap ${ARTIFACT} /app.jar
 
-COPY --chown=sdc:sdc org.onap.sdc.p12 /keystore
-COPY --chown=sdc:sdc org.onap.sdc.trust.jks /truststore
+COPY --chown=onap:onap org.onap.sdc.p12 /keystore
+COPY --chown=onap:onap org.onap.sdc.trust.jks /truststore
 
-COPY --chown=sdc:sdc startup.sh .
+COPY --chown=onap:onap startup.sh .
 RUN chmod 744 startup.sh
  
 RUN mkdir /var/log/ONAP/
-RUN chown sdc:sdc /var/log/ONAP/
+RUN chown onap:onap /var/log/ONAP/
 
-USER sdc
+USER onap
 ENTRYPOINT [ "./startup.sh" ]
diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml
index c06314e0..a3fdf903 100644
--- a/sdc-workflow-designer-be/pom.xml
+++ b/sdc-workflow-designer-be/pom.xml
@@ -18,6 +18,7 @@
         <mapstruct.version>1.3.1.Final</mapstruct.version>
         <lombok.version>1.18.0</lombok.version>
         <springfox.version>2.8.0</springfox.version>
+        <jaxb.api.version>2.3.0</jaxb.api.version>
     </properties>
 
     <dependencyManagement>
@@ -160,6 +161,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+       <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb.api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sdc-workflow-designer-ui/docker/Dockerfile b/sdc-workflow-designer-ui/docker/Dockerfile
index 7a54b615..482cd205 100644
--- a/sdc-workflow-designer-ui/docker/Dockerfile
+++ b/sdc-workflow-designer-ui/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM jetty:9.4-jre8-alpine
+FROM jetty:9.4.31-jre11-slim
 
 EXPOSE 8080
 EXPOSE 8443