From a4070df3b6bdba01423c92c259434fd5f4cfb037 Mon Sep 17 00:00:00 2001
From: Andrew Lindesay <apl@lindesay.co.nz>
Date: Wed, 15 Nov 2023 23:22:31 +1300
Subject: [PATCH] upgrade to java 21 (temurin) and bump debian

---
 Dockerfile                      | 32 ++++++++++++++++++++------------
 haikudepotserver-parent/pom.xml |  4 ++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 41290724..8a6f9d9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,18 @@
 # -------------------------------------
 # Assemble the build image with the dependencies
 
-FROM debian:12.1-slim as build
+FROM debian:12.2-slim as build
 
 RUN apt-get update && \
-    apt-get -y install openjdk-17-jdk && \
+    apt-get -y install wget apt-transport-https gnupg
+
+RUN wget -O - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add - && \
+    echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+
+# the handling here for `ca-certificates-java` is to get around a sequencing
+# problem that comes up with GitHub actions.
+RUN apt-get update && \
+    apt-get -y install temurin-21-jdk && \
     apt-get -y install wget python3 fontconfig fonts-dejavu-core lsb-release gnupg2 && \
     apt-get -y install postgresql postgresql-contrib
 
@@ -37,12 +45,7 @@ COPY ./haikudepotserver-core/pom.xml /hds-src/haikudepotserver-core/pom.xml
 
 WORKDIR /hds-src
 
-# capture the dependencies into the image
-#   [apl 2.apr.2023] temporary disabled owing to a missing `SNAPSHOT` dependency
-#   being used in the module.  See here;
-#   https://github.com/micrometer-metrics/micrometer/issues/3738
-#   Re-enable this line once the problem is resolved.
-# RUN ./mvnw clean org.apache.maven.plugins:maven-dependency-plugin:3.3.0:go-offline
+RUN ./mvnw clean org.apache.maven.plugins:maven-dependency-plugin:3.6.1:go-offline
 
 COPY ./haikudepotserver-spa1/package.json /hds-src/haikudepotserver-spa1/package.json
 
@@ -72,14 +75,19 @@ RUN ./mvnw clean install
 # -------------------------------------
 # Create the container that will eventually run HDS
 
-FROM debian:12.1-slim AS runtime
+FROM debian:12.2-slim AS runtime
+
+RUN apt-get update && \
+    apt-get -y install wget apt-transport-https gnupg
+
+RUN wget -O - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add - && \
+    echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
 # the handling here for `ca-certificates-java` is to get around a sequencing
 # problem that comes up with GitHub actions.
 RUN apt-get update && \
-    apt-get -y install openjdk-17-jre && \
-    apt-get -y install wget optipng libpng16-16 curl fontconfig fonts-dejavu-core
-
+    apt-get -y install temurin-21-jre && \
+    apt-get -y install optipng libpng16-16 curl fontconfig fonts-dejavu-core
 
 ENV HDS_B_HTTP_PORT=8080
 ENV HDS_B_HTTP_ACTUATOR_PORT=8081
diff --git a/haikudepotserver-parent/pom.xml b/haikudepotserver-parent/pom.xml
index 66c3491d..d0fb0805 100644
--- a/haikudepotserver-parent/pom.xml
+++ b/haikudepotserver-parent/pom.xml
@@ -28,8 +28,8 @@
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.parameters>true</maven.compiler.parameters>
 
         <spring-boot.version>3.1.4</spring-boot.version>