stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8200083: Bump bootjdk requirement for JDK 11 to JDK 10

Browse Source 
Reviewed-by: tbell, ihse
This commit is contained in:
Erik Joelsson 2018-05-03 14:13:20 -07:00
parent cf20cdd06c
commit 180f72854f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/autoconf/version-numbers
View File

@ -32,7 +32,7 @@ DEFAULT_VERSION_PATCH=0
DEFAULT_VERSION_DATE=2018-09-25 DEFAULT_VERSION_DATE=2018-09-25
DEFAULT_VERSION_CLASSFILE_MAJOR=55 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`" DEFAULT_VERSION_CLASSFILE_MAJOR=55 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0 DEFAULT_VERSION_CLASSFILE_MINOR=0
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="9 10 11" DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"
LAUNCHER_NAME=openjdk LAUNCHER_NAME=openjdk
PRODUCT_NAME=OpenJDK PRODUCT_NAME=OpenJDK

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

@ -390,7 +390,7 @@ var getJibProfilesCommon = function (input, data) {
}; };
}; };
common.boot_jdk_version = "9"; common.boot_jdk_version = "10";
common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-" common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-"
+ common.boot_jdk_version + common.boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : ""); + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@ -848,7 +848,7 @@ var getJibProfilesDependencies = function (input, common) {
server: "jpg", server: "jpg",
product: "jdk", product: "jdk",
version: common.boot_jdk_version, version: common.boot_jdk_version,
build_number: "181", build_number: "46",
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_" file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin.tar.gz", + boot_jdk_platform + "_bin.tar.gz",
configure_args: "--with-boot-jdk=" + common.boot_jdk_home, configure_args: "--with-boot-jdk=" + common.boot_jdk_home,