From 74eb159a36fccbdd087174d83a206c2f40d41837 Mon Sep 17 00:00:00 2001
From: Michele Adduci <michele.adduci@gematik.de>
Date: Mon, 20 Nov 2023 06:11:53 +0100
Subject: [PATCH] Updated Jetty and JRE in Docker, fixed Alpine build

---
 Dockerfile.jetty        | 4 ++--
 Dockerfile.jetty-alpine | 9 +++++----
 pom.parent.xml          | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.jetty b/Dockerfile.jetty
index ab140c2..1dcae97 100644
--- a/Dockerfile.jetty
+++ b/Dockerfile.jetty
@@ -1,4 +1,4 @@
-FROM maven:3-eclipse-temurin-11 AS builder
+FROM maven:3-eclipse-temurin-17 AS builder
 
 COPY pom.xml pom.parent.xml /app/
 COPY src/main /app/src/main/
@@ -8,7 +8,7 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
 
 ########################################################################################
 
-FROM jetty:11.0.15-jre11
+FROM jetty:11.0.18-jre17-eclipse-temurin
 
 # Proxy and OldProxy need empty path segments support in URIs
 # Hence: allow AMBIGUOUS_EMPTY_SEGMENT
diff --git a/Dockerfile.jetty-alpine b/Dockerfile.jetty-alpine
index 251adca..25c212d 100644
--- a/Dockerfile.jetty-alpine
+++ b/Dockerfile.jetty-alpine
@@ -1,4 +1,4 @@
-FROM maven:3-eclipse-temurin-11-alpine AS builder
+FROM maven:3-eclipse-temurin-17-alpine AS builder
 
 COPY pom.xml pom.parent.xml /app/
 COPY src/main /app/src/main/
@@ -8,7 +8,7 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
 
 ########################################################################################
 
-FROM jetty:11.0.15-jre11-alpine-eclipse-temurin
+FROM jetty:11.0.18-jre17-alpine-eclipse-temurin
 
 # Proxy and OldProxy need empty path segments support in URIs
 # Hence: allow AMBIGUOUS_EMPTY_SEGMENT
@@ -30,9 +30,10 @@ ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
 RUN apk add --no-cache \
         g++ \
         jq \
-        libexpat \
+        expat-dev \
         make \
         zlib \
+        pkgconf \
         && \
     mkdir -p $GRAPHVIZ_BUILD_DIR && \
     cd $GRAPHVIZ_BUILD_DIR && \
@@ -46,7 +47,7 @@ RUN apk add --no-cache \
     apk del --no-cache \
         g++ \
         jq \
-        libexpat \
+        expat-dev \
         make \
         zlib \
         && \
diff --git a/pom.parent.xml b/pom.parent.xml
index 3106af8..747730c 100644
--- a/pom.parent.xml
+++ b/pom.parent.xml
@@ -63,7 +63,7 @@
     <!-- main versions -->
     <plantuml.version>1.2023.12</plantuml.version>
     <!-- Please keep the jetty version identical with the docker image -->
-    <jetty.version>11.0.15</jetty.version>
+    <jetty.version>11.0.18</jetty.version>
     <!--
       While changing the version, please update the versions in the following files as well:
       - src/main/webapp/components/app-head.jsp (script import)