Merge "Revert^2 "Switch to JDK 21"" into main

2024-03-11 18:40:04 +00:00
parent bfa20d7e15 5dfa238f22
commit 7f4fa82732
2 changed files with 7 additions and 13 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -131,12 +131,7 @@ func init() {
 		if override := ctx.Config().Getenv("OVERRIDE_JLINK_VERSION_NUMBER"); override != "" {
 			return override
 		}
-		switch ctx.Config().Getenv("EXPERIMENTAL_USE_OPENJDK21_TOOLCHAIN") {
-		case "true":
-			return "21"
-		default:
-			return "17"
-		}
+		return "21"
 	})

 	pctx.SourcePathVariable("JavaToolchain", "${JavaHome}/bin")