Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8248984: Bump minimum boot jdk to JDK 15
Reviewed-by: darcy, erikj, dholmes
  • Loading branch information
vidmik committed Sep 28, 2020
1 parent ac15d64 commit 527b0e44eba9ec70cc2b3622a1d1e94b06b8017d
Showing with 5 additions and 18 deletions.
  1. +1 −1 make/autoconf/version-numbers
  2. +4 −17 make/conf/jib-profiles.js
@@ -36,7 +36,7 @@ DEFAULT_VERSION_EXTRA3=0
DEFAULT_VERSION_DATE=2021-03-16
DEFAULT_VERSION_CLASSFILE_MAJOR=60 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
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_PROMOTED_VERSION_PRE=ea

@@ -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_home = input.get("boot_jdk", "install_path") + "/jdk-"
+ 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") + "/bin");

if (input.build_cpu == 'aarch64') {
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 = {
var dependencies = {
boot_jdk: {
server: "jpg",
product: "jdk",
version: common.boot_jdk_version,
@@ -1013,11 +1004,7 @@ var getJibProfilesDependencies = function (input, common) {
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}
}

var dependencies = {
boot_jdk: boot_jdk,
},

devkit: {
organization: common.organization,

0 comments on commit 527b0e4

Please sign in to comment.