From 0f8e77d9ae21a0738c7c66b9522b5f7dce785015 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 24 Feb 2020 13:55:38 +0200
Subject: Maven import jakarta XML Binding

Fills-up missing libs in JDK-11

Issue-ID: VID-498

Change-Id: Iac2da61527b28675c65b05fcef57c0feff0f090a
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 epsdk-app-onap/pom.xml             | 15 ++++++++++++---
 vid-app-common/pom.xml             |  7 ++++---
 vid-ext-services-simulator/pom.xml | 15 ++++++++++++---
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index a7ce6b492..489fd309e 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -26,6 +26,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <epsdk.version>2.6.0</epsdk.version>
         <epsdk.overlay.version>2.5.0</epsdk.overlay.version>
+        <jaxb.version>2.3.2</jaxb.version>
         <jackson.version>2.10.1</jackson.version>
         <jackson.databind.version>2.10.1</jackson.databind.version>
         <springframework.version>5.2.3.RELEASE</springframework.version>
@@ -467,10 +468,18 @@
             <version>${springframework.version}</version>
         </dependency>
 
+        <!-- https://eclipse-ee4j.github.io/jaxb-ri/#maven-artifacts -->
+        <!-- API -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <!-- Runtime -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
 
     </dependencies>
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 94d07dbeb..88c07d7e2 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -33,6 +33,7 @@
          org.springframework.orm.hibernate4.HibernateTransactionManager
          so following orm.version lets epsdk-core find it -->
         <hibernate.version>4.3.11.Final</hibernate.version>
+        <jaxb.version>2.3.2</jaxb.version>
         <jackson.version>2.10.1</jackson.version>
         <jackson.databind.version>2.10.1</jackson.databind.version>
         <onap.logging.version>1.6.1</onap.logging.version>
@@ -896,9 +897,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
 
         <dependency>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index b3179cf5e..7c0432e91 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -14,6 +14,7 @@
         <encoding>UTF-8</encoding>
         <springframework.version>5.1.9.RELEASE</springframework.version>
         <hibernate.version>5.3.4.Final</hibernate.version>
+        <jaxb.version>2.3.2</jaxb.version>
         <jackson.version>2.9.9</jackson.version>
         <jackson.databind.version>2.9.9.3</jackson.databind.version>
         <!-- Skip assembling the zip by default -->
@@ -145,10 +146,18 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.databind.version}</version>
         </dependency>
+        <!-- https://eclipse-ee4j.github.io/jaxb-ri/#maven-artifacts -->
+        <!-- API -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.2.11</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
+        <!-- Runtime -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb.version}</version>
         </dependency>
 
         <dependency>
-- 
cgit 1.2.3-korg


From 8f70f2a3586588c6be369756330633d24e4cfe6d Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 24 Feb 2020 16:07:26 +0200
Subject: Move to jdk11-openjdk-slim (was jre8-alpine)

Issue-ID: VID-498
Issue-ID: VID-756

Change-Id: Ia95e99f464d7f2e107821492cef522badee693fc
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 deliveries/src/main/docker/docker-files/Dockerfile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index f6070d8b1..be6c08bc3 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,9 +1,17 @@
-FROM tomcat:9.0-jre8-alpine
+FROM tomcat:9-jdk11-openjdk-slim
 
 # add vim and uncomment alias to speedup troubleshooting purpose
 RUN apk update && apk add openjdk8 vim net-tools
 
-RUN adduser --disabled-password onap onap
+ARG user=onap
+ARG group=onap
+
+# Create a group and user
+RUN groupadd -r $group && useradd -ms /bin/bash $user -g $group && \
+    mkdir /opt/$user && \
+    chown -R $user:$group /opt/$user &&  \
+    mkdir /var/log/$user && \
+    chown -R $user:$group /var/log/$user
 
 # MariaDB variables
 ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
@@ -87,7 +95,7 @@ ADD maven/config/server.xml ${VID_TOMCAT_PATH}
 ADD maven/scripts/*.sh /tmp/vid/
 ADD maven/artifacts/vid.war /tmp/vid/stage/
 
-RUN chown onap:onap /tmp/vid /usr/local/tomcat -R
+RUN chown $user:$group /tmp/vid /usr/local/tomcat -R
 RUN chmod +x /tmp/vid/localize.sh
-USER onap
+USER $user
 CMD ["/tmp/vid/localize.sh"]
-- 
cgit 1.2.3-korg