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

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

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