8221414: Bump required boot jdk version to 12

Reviewed-by: mikael, tbell
This commit is contained in:
Erik Joelsson 2019-03-26 09:24:01 -07:00
parent af4328cd62
commit 75dd3985ca
2 changed files with 4 additions and 3 deletions

View File

@ -35,7 +35,7 @@ DEFAULT_VERSION_EXTRA3=0
DEFAULT_VERSION_DATE=2019-09-17
DEFAULT_VERSION_CLASSFILE_MAJOR=57 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12 13"
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="12 13"
LAUNCHER_NAME=openjdk
PRODUCT_NAME=OpenJDK

View File

@ -365,7 +365,8 @@ var getJibProfilesCommon = function (input, data) {
};
};
common.boot_jdk_version = "11";
common.boot_jdk_version = "12";
common.boot_jdk_build_number = "33";
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
+ common.boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@ -980,7 +981,7 @@ var getJibProfilesDependencies = function (input, common) {
server: "jpg",
product: "jdk",
version: common.boot_jdk_version,
build_number: "28",
build_number: common.boot_jdk_build_number,
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,