From 2d6d1fa8905d59603b717624d9e5ea96e699b803 Mon Sep 17 00:00:00 2001
From: davem-bis <68955845+davem-bis@users.noreply.github.com>
Date: Wed, 2 Sep 2026 11:13:42 +0100
Subject: [PATCH 1/2] Moved java installation into the post-create-command.sh
 script, due to a breaking change in the SDKMAN! API causing the previous
 version to fail to install.

Signed-off-by: davem-bis <68955845+davem-bis@users.noreply.github.com>
---
 .devcontainer/devcontainer-lock.json | 5 -----
 .devcontainer/devcontainer.json      | 3 ---
 .devcontainer/post-create-command.sh | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
index b33ff1a703..43be94a123 100644
--- a/.devcontainer/devcontainer-lock.json
+++ b/.devcontainer/devcontainer-lock.json
@@ -10,11 +10,6 @@
       "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:4fa87399214366e320d489991769c4f3f461e1ffe461f54eea78a41b34945bb5",
       "integrity": "sha256:4fa87399214366e320d489991769c4f3f461e1ffe461f54eea78a41b34945bb5"
     },
-    "ghcr.io/devcontainers/features/java:1": {
-      "version": "1.8.1",
-      "resolved": "ghcr.io/devcontainers/features/java@sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48",
-      "integrity": "sha256:8157bab2d8d71e40b2f3128c162fab763e2b11038fdd33784549290a5d386b48"
-    },
     "ghcr.io/devcontainers/features/python:1": {
       "version": "1.8.0",
       "resolved": "ghcr.io/devcontainers/features/python@sha256:fbcad6955caeecc5ad3f7886baf652e25cba5225a6c4c2287c536de2e5607511",
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d0c250eb41..f9022bbbdd 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,9 +6,6 @@
     "ghcr.io/devcontainers/features/python:1": {
       "version": "3.12"
     },
-    "ghcr.io/devcontainers/features/java:1": {
-      "version": "21"
-    },
     "ghcr.io/devcontainers/features/docker-in-docker:4": {}
   },
   "postCreateCommand": "bash .devcontainer/post-create-command.sh",
diff --git a/.devcontainer/post-create-command.sh b/.devcontainer/post-create-command.sh
index 4ba84850bc..d104c972ed 100644
--- a/.devcontainer/post-create-command.sh
+++ b/.devcontainer/post-create-command.sh
@@ -20,7 +20,7 @@ else
     rm packages-microsoft-prod.deb
 fi
 
-ALL_DEPENDENCIES="libpq-dev netcat-traditional unixodbc-dev default-jdk msodbcsql18"
+ALL_DEPENDENCIES="libpq-dev netcat-traditional unixodbc-dev default-jdk msodbcsql18 msopenjdk-21"
 sudo apt-get clean && sudo apt-get -y update && sudo ACCEPT_EULA='Y' apt-get -y install $ALL_DEPENDENCIES
 
 # Install Python dependencies

From 237a7ea0fe449397436290c6fc18066ca78482b1 Mon Sep 17 00:00:00 2001
From: davem-bis <68955845+davem-bis@users.noreply.github.com>
Date: Mon, 7 Sep 2026 16:23:24 +0100
Subject: [PATCH 2/2] Removed superfluous java installation.

Signed-off-by: davem-bis <68955845+davem-bis@users.noreply.github.com>
---
 .devcontainer/post-create-command.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/post-create-command.sh b/.devcontainer/post-create-command.sh
index d104c972ed..4ba84850bc 100644
--- a/.devcontainer/post-create-command.sh
+++ b/.devcontainer/post-create-command.sh
@@ -20,7 +20,7 @@ else
     rm packages-microsoft-prod.deb
 fi
 
-ALL_DEPENDENCIES="libpq-dev netcat-traditional unixodbc-dev default-jdk msodbcsql18 msopenjdk-21"
+ALL_DEPENDENCIES="libpq-dev netcat-traditional unixodbc-dev default-jdk msodbcsql18"
 sudo apt-get clean && sudo apt-get -y update && sudo ACCEPT_EULA='Y' apt-get -y install $ALL_DEPENDENCIES
 
 # Install Python dependencies