8242863: Bump minimum boot jdk to JDK 14
Reviewed-by: ihse, jlahoda, dholmes
This commit is contained in:
parent
85d07da475
commit
bc3ed7bdb4
make
@ -345,7 +345,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
|
|||||||
|
|
||||||
# When compiling code to be executed by the Boot JDK, force compatibility with the
|
# When compiling code to be executed by the Boot JDK, force compatibility with the
|
||||||
# oldest supported bootjdk.
|
# oldest supported bootjdk.
|
||||||
BOOT_JDK_SOURCETARGET="-source 13 -target 13"
|
OLDEST_BOOT_JDK=`$ECHO $DEFAULT_ACCEPTABLE_BOOT_VERSIONS \
|
||||||
|
| $TR " " "\n" | $SORT -n | $HEAD -n1`
|
||||||
|
BOOT_JDK_SOURCETARGET="-source $OLDEST_BOOT_JDK -target $OLDEST_BOOT_JDK"
|
||||||
AC_SUBST(BOOT_JDK_SOURCETARGET)
|
AC_SUBST(BOOT_JDK_SOURCETARGET)
|
||||||
|
|
||||||
AC_SUBST(JAVAC_FLAGS)
|
AC_SUBST(JAVAC_FLAGS)
|
||||||
|
@ -36,7 +36,7 @@ DEFAULT_VERSION_EXTRA3=0
|
|||||||
DEFAULT_VERSION_DATE=2020-09-15
|
DEFAULT_VERSION_DATE=2020-09-15
|
||||||
DEFAULT_VERSION_CLASSFILE_MAJOR=59 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
|
DEFAULT_VERSION_CLASSFILE_MAJOR=59 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
|
||||||
DEFAULT_VERSION_CLASSFILE_MINOR=0
|
DEFAULT_VERSION_CLASSFILE_MINOR=0
|
||||||
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="13 14 15"
|
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="14 15"
|
||||||
DEFAULT_JDK_SOURCE_TARGET_VERSION=15
|
DEFAULT_JDK_SOURCE_TARGET_VERSION=15
|
||||||
DEFAULT_PROMOTED_VERSION_PRE=ea
|
DEFAULT_PROMOTED_VERSION_PRE=ea
|
||||||
|
|
||||||
|
@ -381,8 +381,8 @@ var getJibProfilesCommon = function (input, data) {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
common.boot_jdk_version = "13";
|
common.boot_jdk_version = "14";
|
||||||
common.boot_jdk_build_number = "33";
|
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
|
||||||
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
|
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
|
||||||
@ -1009,16 +1009,16 @@ var getJibProfilesDependencies = function (input, common) {
|
|||||||
: input.get("gnumake", "install_path") + "/bin");
|
: input.get("gnumake", "install_path") + "/bin");
|
||||||
|
|
||||||
if (input.build_cpu == 'aarch64') {
|
if (input.build_cpu == 'aarch64') {
|
||||||
boot_jdk = {
|
boot_jdk = {
|
||||||
organization: common.organization,
|
organization: common.organization,
|
||||||
ext: "tar.gz",
|
ext: "tar.gz",
|
||||||
module: "jdk-linux_aarch64",
|
module: "jdk-linux_aarch64",
|
||||||
revision: "13+1.0",
|
revision: "13+1.0",
|
||||||
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"
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
boot_jdk = {
|
boot_jdk = {
|
||||||
server: "jpg",
|
server: "jpg",
|
||||||
product: "jdk",
|
product: "jdk",
|
||||||
version: common.boot_jdk_version,
|
version: common.boot_jdk_version,
|
||||||
@ -1027,7 +1027,12 @@ 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"
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (input.build_cpu == 'sparcv9') {
|
||||||
|
boot_jdk.file = "bundles/openjdk/GPL/" + boot_jdk_platform
|
||||||
|
+ "/openjdk-" + common.boot_jdk_version + "_"
|
||||||
|
+ boot_jdk_platform + "_bin" + boot_jdk_ext;
|
||||||
}
|
}
|
||||||
|
|
||||||
var dependencies = {
|
var dependencies = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user