From 99efa0c0c0deffbc31d90e3c9fe93f6f200f037e Mon Sep 17 00:00:00 2001
From: Peter Smythe <peter@afrigis.co.za>
Date: Mon, 25 May 2026 14:40:19 +0200
Subject: [PATCH 1/2] chore(docker): Update Java and Maven versions with
 improved resilience

- Upgrade OpenJDK from version 11 to 17
- Update Maven from version 3.9.12 to 3.9.16
- Add fallback Maven download source (archive.apache.org) for improved resilience
- Update JAVA_HOME environment variable to reference Java 17 installation path
- Improves compatibility and adds redundancy for Maven installation reliability
---
 Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6cb7c46a2..330292bf2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,15 +11,16 @@ RUN apt-get update && \
     git \
     wget \
     unzip \
-    openjdk-11-jdk \
+    openjdk-17-jdk \
     python3-pip \
     dos2unix \
     vim \
     && rm -rf /var/lib/apt/lists/*
 
-ARG MAVEN_VERSION=3.9.12
-# Install Maven
-RUN wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -O /tmp/maven.zip && \
+ARG MAVEN_VERSION=3.9.16
+# Install Maven (try CDN first, fall back to archive for resilience)
+RUN (wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -O /tmp/maven.zip || \
+    wget https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip -O /tmp/maven.zip) && \
     unzip /tmp/maven.zip -d /opt && \
     ln -s /opt/apache-maven-${MAVEN_VERSION} /opt/maven && \
     ln -s /opt/maven/bin/mvn /usr/bin/mvn && \
@@ -47,7 +48,7 @@ RUN wget https://sourceforge.net/projects/xframe/files/xsddoc/xsddoc-1.0/xsddoc-
 RUN curl "https://repo1.maven.org/maven2/xerces/xercesImpl/2.12.2/xercesImpl-2.12.2.jar" -o /opt/xsddoc-1.0/lib/xercesImpl.jar
 
 # Set Java environment variables
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 ENV PATH=$JAVA_HOME/bin:/opt/xsddoc-1.0/bin:$PATH
 
 # Clone the GeoWebCache repositories

From 91d4a527b5227a3985c6a0c6faf03907106197e8 Mon Sep 17 00:00:00 2001
From: Peter Smythe <peter@afrigis.co.za>
Date: Mon, 25 May 2026 15:32:47 +0200
Subject: [PATCH 2/2] chore(git): Configure credential caching to reduce
 authentication prompts

- Add git credential helper configuration with 60-second timeout
- Cache credentials in memory to avoid repeated authentication prompts during setup
- Improves user experience when running multiple git operations in sequence
---
 setup_git.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup_git.sh b/setup_git.sh
index 15f711cb5..39fad0649 100644
--- a/setup_git.sh
+++ b/setup_git.sh
@@ -11,4 +11,7 @@ if [ -n "$GIT_EMAIL" ]; then
     git config --global user.email "$GIT_EMAIL"
 fi
 
+# Cache credentials in memory for 1 min to avoid repeated prompts
+git config --global credential.helper 'cache --timeout=60'
+
 exec /bin/bash