[java]- Add support for debian trixie(13)

src/java/.devcontainer/Dockerfile

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

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-bookworm, 17 / 17-bookworm, 21 / 21-bookworm, 11-bullseye, 17-bullseye, 21-bullseye ([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, 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,19 +22,19 @@ 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:21` (or `21-bookworm`, `21-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:11` (or `17-bookworm`, `11-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:17` (or `17-bookworm`, `17-bullseye` 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)
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
-- `mcr.microsoft.com/devcontainers/java:1-11` (or `1-11-bookworm`, `1-11-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:1.0-11` (or `1.0-11-bookworm`, `1.0-11-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:1.0.0-11` (or `1.0.0-11-bookworm`, `1.0.0-11-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/java:2-11` (or `2-11-trixie`, `2-11-bookworm` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/java:2.0-11` (or `2.0-11-trixie`, `2.0-11-bookworm` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/java:2.0.0-11` (or `2.0.0-11-trixie`, `2.0.0-11-bookworm` to pin to an OS version)
 
-However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `1-11`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
+However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-11`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/java/tags/list).
 

src/java/manifest.json

@@ -1,66 +1,66 @@
 {
-	"version": "1.1.24",
+	"version": "2.0.0",
 	"variants": [
+		"21-trixie",
+		"17-trixie",
+		"11-trixie",
 		"21-bookworm",
-		"21-bullseye",
 		"17-bookworm",
-		"17-bullseye",
-		"11-bookworm",
-		"11-bullseye"
+		"11-bookworm"
 	],
 	"build": {
-		"latest": "21-bookworm",
+		"latest": "21-trixie",
 		"rootDistro": "debian",
 		"parent": "base-debian",
 		"idMismatch": "true",
 		"variantBuildArgs": {
-			"21-bookworm": {
+			"21-trixie": {
 				"TARGET_JAVA_VERSION": "21",
-				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
+				"BASE_IMAGE_VERSION_CODENAME": "trixie"
 			},
-			"17-bookworm": {
+			"17-trixie": {
 				"TARGET_JAVA_VERSION": "17",
-				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
+				"BASE_IMAGE_VERSION_CODENAME": "trixie"
 			},
-			"11-bookworm": {
+			"11-trixie": {
 				"TARGET_JAVA_VERSION": "11",
-				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
+				"BASE_IMAGE_VERSION_CODENAME": "trixie"
 			},
-			"21-bullseye": {
+			"21-bookworm": {
 				"TARGET_JAVA_VERSION": "21",
-				"BASE_IMAGE_VERSION_CODENAME": "bullseye"
+				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
 			},
-			"17-bullseye": {
+			"17-bookworm": {
 				"TARGET_JAVA_VERSION": "17",
-				"BASE_IMAGE_VERSION_CODENAME": "bullseye"
+				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
 			},
-			"11-bullseye": {
+			"11-bookworm": {
 				"TARGET_JAVA_VERSION": "11",
-				"BASE_IMAGE_VERSION_CODENAME": "bullseye"
+				"BASE_IMAGE_VERSION_CODENAME": "bookworm"
 			}
 		},
 		"architectures": {
-			"21-bookworm": [
+			"21-trixie": [
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"17-bookworm": [
+			"17-trixie": [
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"11-bookworm": [
+			"11-trixie": [
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"21-bullseye": [
+			"21-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"17-bullseye": [
+			"17-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"11-bullseye": [
+			"11-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
 			]
@@ -69,28 +69,28 @@
 			"java:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"21-bookworm": [
+			"21-trixie": [
 				"java:${VERSION}-21",
+				"java:${VERSION}-21-jdk-trixie",
+				"java:${VERSION}-trixie"
+			],
+			"17-trixie": [
+				"java:${VERSION}-17",
+				"java:${VERSION}-17-jdk-trixie"
+			],
+			"11-trixie": [
+				"java:${VERSION}-11",
+				"java:${VERSION}-11-jdk-trixie"
+			],
+			"21-bookworm": [
 				"java:${VERSION}-21-jdk-bookworm",
 				"java:${VERSION}-bookworm"
 			],
 			"17-bookworm": [
-				"java:${VERSION}-17",
 				"java:${VERSION}-17-jdk-bookworm"
 			],
 			"11-bookworm": [
-				"java:${VERSION}-11",
 				"java:${VERSION}-11-jdk-bookworm"
-			],
-			"21-bullseye": [
-				"java:${VERSION}-21-jdk-bullseye",
-				"java:${VERSION}-bullseye"
-			],
-			"17-bullseye": [
-				"java:${VERSION}-17-jdk-bullseye"
-			],
-			"11-bullseye": [
-				"java:${VERSION}-11-jdk-bullseye"
 			]
 		}
 	},