From b008a33a8fa2fd66aa7e99559d4fe1f403f95b53 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 27 Sep 2025 10:52:23 -0500
Subject: [PATCH] Added java25 images, deprecated java24 (#3675)

---
 .github/workflows/build-multiarch.yml | 14 +++++++-------
 docs/versions/java.md                 |  5 +++--
 images.json                           | 24 ++++++++++++++++++++----
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 2af640b3..66ecb2b0 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -21,8 +21,8 @@ jobs:
       matrix:
         # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
         variant:
-          - java24
-          - java24-graalvm
+          - java25
+          - java25-graalvm
           - java21
           - java21-alpine
           - java21-graalvm
@@ -37,13 +37,13 @@ jobs:
           - java8-openj9
           - java8-jdk
         include:
-        # JAVA 24
-          - variant: java24
-            baseImage: eclipse-temurin:24-jre
+        # JAVA 25
+          - variant: java25
+            baseImage: eclipse-temurin:25-jre
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
-          - variant: java24-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:24-ol8
+          - variant: java25-graalvm
+            baseImage: container-registry.oracle.com/graalvm/jdk:25-ol8
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
         # JAVA 21:
diff --git a/docs/versions/java.md b/docs/versions/java.md
index 8e69b782..f854b3f3 100644
--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -14,8 +14,8 @@ where `<tag>` refers to the first column of this table:
 |----------------|--------------|--------|--------------------|---------------------|------|
 | latest         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
 | stable         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| java24         | 24           | Ubuntu | Hotspot            | amd64, arm64        | (2)  |
-| java24-graalvm | 24           | Oracle | Oracle GraalVM (3) | amd64, arm64        | (2)  |   
+| java25         | 25           | Ubuntu | Hotspot            | amd64, arm64        |      |
+| java25-graalvm | 25           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
 | java21         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
 | java21-jdk     | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
 | java21-alpine  | 21           | Alpine | Hotspot            | amd64, arm64        |      |
@@ -137,6 +137,7 @@ The following image tags have been deprecated and are no longer receiving update
 - java19
 - java20-graalvm, java20, java20-alpine
 - java23-*
+- java24, java24-graalvm 
 - java8-multiarch is still built and pushed, but please move to java8 instead
 - java8-alpine, java8-jdk, java8-openj9, java8-graalvm-ce
 
diff --git a/images.json b/images.json
index 808f3a3d..3d5aa5a8 100644
--- a/images.json
+++ b/images.json
@@ -17,19 +17,35 @@
     "architectures": ["amd64", "arm64"],
     "lts": true
   },
+  {
+    "tag": "java25",
+    "java": "25",
+    "distribution": "ubuntu",
+    "jvm": "hotspot",
+    "architectures": ["amd64", "arm64"]
+  },
+  {
+    "tag": "java25-graalvm",
+    "java": "25",
+    "distribution": "oracle",
+    "jvm": "graalvm",
+    "architectures": ["amd64", "arm64"]
+  },
   {
     "tag": "java24",
     "java": "24",
     "distribution": "ubuntu",
     "jvm": "hotspot",
-    "architectures": ["amd64", "arm64"]
+    "architectures": ["amd64", "arm64"],
+    "deprecated": true
   },
   {
     "tag": "java24-graalvm",
     "java": "24",
     "distribution": "oracle",
     "jvm": "graalvm",
-    "architectures": ["amd64", "arm64"]
+    "architectures": ["amd64", "arm64"],
+    "deprecated": true
   },
   {
     "tag": "java21",
@@ -51,7 +67,7 @@
     "java": "21",
     "distribution": "oracle",
     "jvm": "graalvm",
-    "architectures": ["amd64", "arm64"],
+    "architectures": ["amd64", "arm64"]
   },
   {
     "tag": "java21-jdk",
@@ -66,7 +82,7 @@
     "java": "21",
     "distribution": "oracle",
     "jvm": "graalvm",
-    "architectures": ["amd64", "arm64"],
+    "architectures": ["amd64", "arm64"]
   },
   {
     "tag": "java17",