From 9de8cb187665dab1fa1fa173f4c22158fa53bbaa Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 20 Jan 2024 11:09:07 -0700
Subject: [PATCH] Use latest Debian and Eclipse Temurin releases

* Debian Bookworm 20240110
* Java 11.0.21
* Java 17.0.9
* Java 21.0.1

New Java releases are currently being prepared by Eclipse Temurin.
When they are available, the Java versions will need to be upgraded to:

* Java 11.0.22
* Java 17.0.10
* Java 21.0.2
---
 debian/Dockerfile         | 4 ++--
 debian/preview/Dockerfile | 2 +-
 docker-bake.hcl           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/Dockerfile b/debian/Dockerfile
index 3333b261e..269e85948 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -19,8 +19,8 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-ARG DEBIAN_RELEASE=bookworm-20230904
-ARG JAVA_VERSION=17.0.8.1_1
+ARG DEBIAN_RELEASE=bookworm-20240110
+ARG JAVA_VERSION=17.0.9_9
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy AS jre-build
 
 # This Build ARG is populated by Docker
diff --git a/debian/preview/Dockerfile b/debian/preview/Dockerfile
index 32a2caea1..a67e81181 100644
--- a/debian/preview/Dockerfile
+++ b/debian/preview/Dockerfile
@@ -1,4 +1,4 @@
-ARG DEBIAN_RELEASE=bookworm-20230904
+ARG DEBIAN_RELEASE=bookworm-20240110
 FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build
 ARG JAVA_VERSION
 ARG TARGETPLATFORM
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 79149924c..610a6546f 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -105,19 +105,19 @@ variable "ALPINE_SHORT_TAG" {
 }
 
 variable "DEBIAN_RELEASE" {
-  default = "bookworm-20230904"
+  default = "bookworm-20240110"
 }
 
 variable "JAVA11_VERSION" {
-  default = "11.0.20.1_1"
+  default = "11.0.21_9"
 }
 
 variable "JAVA17_VERSION" {
-  default = "17.0.8.1_1"
+  default = "17.0.9_9"
 }
 
 variable "JAVA21_VERSION" {
-  default = "21_35"
+  default = "21.0.1_12"
 }
 
 variable "JAVA21_PREVIEW_VERSION" {