Skip to content

Commit 83c0e45

Browse files
committed
8306630: Bump minimum boot jdk to JDK 21
Reviewed-by: darcy, erikj, iris, shade
1 parent d3a79b5 commit 83c0e45

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

make/conf/github-actions.conf

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ GTEST_VERSION=1.14.0
2929
JTREG_VERSION=7.3.1+1
3030

3131
LINUX_X64_BOOT_JDK_EXT=tar.gz
32-
LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz
33-
LINUX_X64_BOOT_JDK_SHA256=bb863b2d542976d1ae4b7b81af3e78b1e4247a64644350b552d298d8dc5980dc
32+
LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz
33+
LINUX_X64_BOOT_JDK_SHA256=a30c454a9bef8f46d5f1bf3122830014a8fbe7ac03b5f8729bc3add4b92a1d0a
3434

3535
MACOS_X64_BOOT_JDK_EXT=tar.gz
36-
MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_macos-x64_bin.tar.gz
37-
MACOS_X64_BOOT_JDK_SHA256=47cf960d9bb89dbe987535a389f7e26c42de7c984ef5108612d77c81aa8cc6a4
36+
MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-x64_bin.tar.gz
37+
MACOS_X64_BOOT_JDK_SHA256=af32e84c11009f72f783fdcdc9917efc277893988f097e198e2576875d1e88c1
3838

3939
WINDOWS_X64_BOOT_JDK_EXT=zip
40-
WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip
41-
WINDOWS_X64_BOOT_JDK_SHA256=c92fae5e42b9aecf444a66c8ec563c652f60b1e231dfdd33a4f5a3e3603058fb
40+
WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_windows-x64_bin.zip
41+
WINDOWS_X64_BOOT_JDK_SHA256=5434faaf029e66e7ce6e75770ca384de476750984a7d2881ef7686894c4b4944

make/conf/jib-profiles.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ var getJibProfilesCommon = function (input, data) {
390390
};
391391
};
392392

393-
common.boot_jdk_version = "20";
394-
common.boot_jdk_build_number = "36";
393+
common.boot_jdk_version = "21";
394+
common.boot_jdk_build_number = "35";
395395
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
396396
+ common.boot_jdk_version
397397
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");

make/conf/version-numbers.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ DEFAULT_VERSION_DATE=2024-03-19
3737
DEFAULT_VERSION_CLASSFILE_MAJOR=66 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
3838
DEFAULT_VERSION_CLASSFILE_MINOR=0
3939
DEFAULT_VERSION_DOCS_API_SINCE=11
40-
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="20 21 22"
40+
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="21 22"
4141
DEFAULT_JDK_SOURCE_TARGET_VERSION=22
4242
DEFAULT_PROMOTED_VERSION_PRE=ea

0 commit comments

Comments
 (0)