Merge branch 'main' of https://github.com/devcontainers/images into eljog/v0.3.26

Author: eljog

src/universal/.devcontainer/devcontainer.json

@@ -43,8 +43,8 @@
             "additionalVersions": "3.1"
         },
         "ghcr.io/devcontainers/features/java:1": {
-            "version": "17",
-            "additionalVersions": "11",
+            "version": "21",
+            "additionalVersions": "17",
             "installGradle": "true",
             "installMaven": "true"
         },