From f603bbf4605596b08581060c52c644131ab324a2 Mon Sep 17 00:00:00 2001
From: Christian Reitter <78539074+ros-cr@users.noreply.github.com>
Date: Tue, 3 Jun 2025 15:35:03 +0200
Subject: [PATCH] Update some versions for OS, Saxon and FOP

---
 docbuilder/Dockerfile | 8 +++++---
 off2rep/Dockerfile    | 8 +++++---
 quickscope/Dockerfile | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/docbuilder/Dockerfile b/docbuilder/Dockerfile
index 49124c3..6113159 100644
--- a/docbuilder/Dockerfile
+++ b/docbuilder/Dockerfile
@@ -1,7 +1,9 @@
-ARG FOP_VERSION=2.7
-ARG SAXON_VERSION=10.5
+ARG FOP_VERSION=2.11
+# there are newer 11.x and 12.x Saxon versions available
+ARG SAXON_VERSION=10.9
 
-FROM eclipse-temurin:20 AS download-and-extract-tools
+# eclipse-temurin:21 tracks JDK 21, which is LTS
+FROM eclipse-temurin:21 AS download-and-extract-tools
 ARG FOP_VERSION
 ARG SAXON_VERSION
 
diff --git a/off2rep/Dockerfile b/off2rep/Dockerfile
index 9dd043a..4cdc5a6 100644
--- a/off2rep/Dockerfile
+++ b/off2rep/Dockerfile
@@ -1,13 +1,15 @@
-ARG SAXON_VERSION=10.3
+# there are newer 11.x and 12.x Saxon versions available
+ARG SAXON_VERSION=10.9
 
-FROM eclipse-temurin:20-alpine as download-and-extract-tools
+# eclipse-temurin:21 tracks JDK 21, which is LTS
+FROM eclipse-temurin:21-alpine as download-and-extract-tools
 ARG SAXON_VERSION
 
 RUN wget https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}.jar
 # use strict to force error exit code when jar is unsigned
 RUN jarsigner -verify -strict Saxon-HE-${SAXON_VERSION}.jar
 
-FROM eclipse-temurin:20-alpine
+FROM eclipse-temurin:21-alpine
 ARG SAXON_VERSION
 
 COPY --from=download-and-extract-tools /Saxon-HE-${SAXON_VERSION}.jar /saxon.jar
diff --git a/quickscope/Dockerfile b/quickscope/Dockerfile
index b8675d9..77bebfb 100644
--- a/quickscope/Dockerfile
+++ b/quickscope/Dockerfile
@@ -1,13 +1,15 @@
-ARG SAXON_VERSION=10.3
+# there are newer 11.x and 12.x Saxon versions available
+ARG SAXON_VERSION=10.9
 
-FROM eclipse-temurin:20-alpine as download-and-extract-tools
+# eclipse-temurin:21 tracks JDK 21, which is LTS
+FROM eclipse-temurin:21-alpine as download-and-extract-tools
 ARG SAXON_VERSION
 
 RUN wget https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/${SAXON_VERSION}/Saxon-HE-${SAXON_VERSION}.jar
 # use strict to force error exit code when jar is unsigned
 RUN jarsigner -verify -strict Saxon-HE-${SAXON_VERSION}.jar
 
-FROM eclipse-temurin:20-alpine
+FROM eclipse-temurin:21-alpine
 ARG SAXON_VERSION
 
 COPY --from=download-and-extract-tools /Saxon-HE-${SAXON_VERSION}.jar /saxon.jar