Skip to content

Commit 0e00598

Browse files
committed
8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
Reviewed-by: iignatyev, tbell, iris, erikj
1 parent e81baea commit 0e00598

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

make/conf/jib-profiles.js

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,13 @@ var getJibProfilesCommon = function (input, data) {
396396
};
397397
};
398398

399-
common.boot_jdk_version = "16";
400-
common.boot_jdk_build_number = "36";
399+
if (input.build_os == 'macosx' && input.build_cpu == 'aarch64') {
400+
common.boot_jdk_version = "17";
401+
common.boot_jdk_build_number = "19";
402+
} else {
403+
common.boot_jdk_version = "16";
404+
common.boot_jdk_build_number = "36";
405+
}
401406
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
402407
+ common.boot_jdk_version
403408
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -1080,27 +1085,15 @@ var getJibProfilesDependencies = function (input, common) {
10801085
boot_jdk_platform = "windows-" + input.build_cpu;
10811086
boot_jdk_ext = ".zip";
10821087
}
1083-
var boot_jdk;
1084-
if (boot_jdk_platform == 'osx-aarch64') {
1085-
boot_jdk = {
1086-
organization: common.organization,
1087-
ext: "tar.gz",
1088-
module: "jdk-macosx_aarch64",
1089-
revision: "16+1.0-beta1",
1090-
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
1091-
environment_path: common.boot_jdk_home + "/bin"
1092-
}
1093-
} else {
1094-
boot_jdk = {
1095-
server: "jpg",
1096-
product: "jdk",
1097-
version: common.boot_jdk_version,
1098-
build_number: common.boot_jdk_build_number,
1099-
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
1100-
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
1101-
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
1102-
environment_path: common.boot_jdk_home + "/bin"
1103-
}
1088+
var boot_jdk = {
1089+
server: "jpg",
1090+
product: "jdk",
1091+
version: common.boot_jdk_version,
1092+
build_number: common.boot_jdk_build_number,
1093+
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
1094+
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
1095+
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
1096+
environment_path: common.boot_jdk_home + "/bin"
11041097
}
11051098

11061099
var makeBinDir = (input.build_os == "windows"

0 commit comments

Comments
 (0)