Support: Java 25 (devcontainers#1345)

Author: m1ngyuan

src/java/.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # This Dockerfile uses separate build arguments instead of VARIANT
-ARG TARGET_JAVA_VERSION=21
+ARG TARGET_JAVA_VERSION=25
 ARG BASE_IMAGE_VERSION_CODENAME=trixie
 FROM mcr.microsoft.com/devcontainers/base:${BASE_IMAGE_VERSION_CODENAME}
 

src/java/README.md

@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/java |
-| *Available image variants* | 11 / 11-trixie, 17 /17-trixie, , 21 / 21-trixie, 21-bookworm, 17-bookworm, 11-bookworm ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) |
+| *Available image variants* | 11 / 11-trixie, 17 /17-trixie, 21 / 21-trixie, 21-bookworm, 25 / 25-trixie, 25-bookworm, 17-bookworm, 11-bookworm ([full list](https://mcr.microsoft.com/v2/devcontainers/java/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -22,6 +22,7 @@ See **[history](history)** for information on the contents of published images.
 You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own  `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
 
 - `mcr.microsoft.com/devcontainers/java` (latest)
+- `mcr.microsoft.com/devcontainers/java:25` (or `25-trixie`, `25-bookworm` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/java:21` (or `21-trixie`, `21-bookworm` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/java:11` (or `11-trixie`, `11-bookworm` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/java:17` (or `17-trixie`, `17-bookworm` to pin to an OS version)

src/java/manifest.json

@@ -1,19 +1,25 @@
 {
 	"version": "2.0.0",
 	"variants": [
+		"25-trixie",
 		"21-trixie",
 		"17-trixie",
 		"11-trixie",
+		"25-bookworm",
 		"21-bookworm",
 		"17-bookworm",
 		"11-bookworm"
 	],
 	"build": {
-		"latest": "21-trixie",
+		"latest": "25-trixie",
 		"rootDistro": "debian",
 		"parent": "base-debian",
 		"idMismatch": "true",
 		"variantBuildArgs": {
+			"25-trixie": {
+				"TARGET_JAVA_VERSION": "25",
+				"BASE_IMAGE_VERSION_CODENAME": "trixie"
+			},
 			"21-trixie": {
 				"TARGET_JAVA_VERSION": "21",
 				"BASE_IMAGE_VERSION_CODENAME": "trixie"
@@ -26,6 +32,10 @@
 				"TARGET_JAVA_VERSION": "11",
 				"BASE_IMAGE_VERSION_CODENAME": "trixie"
 			},
+			"25-bookworm": {
+				"TARGET_JAVA_VERSION": "25",
+				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
+			},
 			"21-bookworm": {
 				"TARGET_JAVA_VERSION": "21",
 				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
@@ -40,6 +50,10 @@
 			}
 		},
 		"architectures": {
+			"25-trixie": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"21-trixie": [
 				"linux/amd64",
 				"linux/arm64"
@@ -52,6 +66,10 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
+			"25-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"21-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
@@ -69,10 +87,14 @@
 			"java:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
+			"25-trixie": [
+				"java:${VERSION}-25",
+				"java:${VERSION}-25-jdk-trixie",
+				"java:${VERSION}-trixie"
+			],
 			"21-trixie": [
 				"java:${VERSION}-21",
-				"java:${VERSION}-21-jdk-trixie",
-				"java:${VERSION}-trixie"
+				"java:${VERSION}-21-jdk-trixie"
 			],
 			"17-trixie": [
 				"java:${VERSION}-17",
@@ -82,10 +104,13 @@
 				"java:${VERSION}-11",
 				"java:${VERSION}-11-jdk-trixie"
 			],
-			"21-bookworm": [
-				"java:${VERSION}-21-jdk-bookworm",
+			"25-bookworm": [
+				"java:${VERSION}-25-jdk-bookworm",
 				"java:${VERSION}-bookworm"
 			],
+			"21-bookworm": [
+				"java:${VERSION}-21-jdk-bookworm"
+			],
 			"17-bookworm": [
 				"java:${VERSION}-17-jdk-bookworm"
 			],