1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8248984: Bump minimum boot jdk to JDK 15

Browse Source 
Reviewed-by: darcy, erikj, dholmes
This commit is contained in:
Mikael Vidstedt 2020-09-28 21:22:00 +00:00
parent ac15d6445b
commit 527b0e44eb
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/autoconf/version-numbers
View File

@ -36,7 +36,7 @@ DEFAULT_VERSION_EXTRA3=0
DEFAULT_VERSION_DATE=2021-03-16 DEFAULT_VERSION_DATE=2021-03-16
DEFAULT_VERSION_CLASSFILE_MAJOR=60 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" DEFAULT_VERSION_CLASSFILE_MAJOR=60 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0 DEFAULT_VERSION_CLASSFILE_MINOR=0
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="14 15 16" DEFAULT_ACCEPTABLE_BOOT_VERSIONS="15 16"
DEFAULT_JDK_SOURCE_TARGET_VERSION=16 DEFAULT_JDK_SOURCE_TARGET_VERSION=16
DEFAULT_PROMOTED_VERSION_PRE=ea DEFAULT_PROMOTED_VERSION_PRE=ea

21
make/conf/jib-profiles.js
View File

@ -381,7 +381,7 @@ var getJibProfilesCommon = function (input, data) {
}; };
}; };
common.boot_jdk_version = "14"; common.boot_jdk_version = "15";
common.boot_jdk_build_number = "36"; common.boot_jdk_build_number = "36";
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-" common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
+ common.boot_jdk_version + common.boot_jdk_version
@ -994,17 +994,8 @@ var getJibProfilesDependencies = function (input, common) {
? input.get("gnumake", "install_path") + "/cygwin/bin" ? input.get("gnumake", "install_path") + "/cygwin/bin"
: input.get("gnumake", "install_path") + "/bin"); : input.get("gnumake", "install_path") + "/bin");
if (input.build_cpu == 'aarch64') { var dependencies = {
boot_jdk = { boot_jdk: {
organization: common.organization,
ext: "tar.gz",
module: "jdk-linux_aarch64",
revision: "14+1.0",
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}
} else {
boot_jdk = {
server: "jpg", server: "jpg",
product: "jdk", product: "jdk",
version: common.boot_jdk_version, version: common.boot_jdk_version,
@ -1013,11 +1004,7 @@ var getJibProfilesDependencies = function (input, common) {
+ boot_jdk_platform + "_bin" + boot_jdk_ext, + boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home, configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin" environment_path: common.boot_jdk_home + "/bin"
} },
}
var dependencies = {
boot_jdk: boot_jdk,
devkit: { devkit: {
organization: common.organization, organization: common.organization,