Merge changes Ia95e99f4,Iac2da615
* changes:
Move to jdk11-openjdk-slim (was jre8-alpine)
Maven import jakarta XML Binding
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index f6070d8..be6c08b 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/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"]
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index a7ce6b4..489fd30 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 94d07db..88c07d7 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 b3179cf..7c0432e 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>