changeset 52531:b091b768fea4

8213569: Bump minimum boot jdk to JDK 11 Reviewed-by: dholmes, tbell, erikj
author mikael
date Tue, 13 Nov 2018 15:25:24 -0800
parents bbbcd90f0adb
children 3b91496409fc
files make/autoconf/version-numbers make/conf/jib-profiles.js
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/autoconf/version-numbers	Tue Nov 13 16:49:58 2018 -0500
+++ b/make/autoconf/version-numbers	Tue Nov 13 15:25:24 2018 -0800
@@ -35,7 +35,7 @@
 DEFAULT_VERSION_DATE=2019-03-19
 DEFAULT_VERSION_CLASSFILE_MAJOR=56  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11 12"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12"
 
 LAUNCHER_NAME=openjdk
 PRODUCT_NAME=OpenJDK
--- a/make/conf/jib-profiles.js	Tue Nov 13 16:49:58 2018 -0500
+++ b/make/conf/jib-profiles.js	Tue Nov 13 15:25:24 2018 -0800
@@ -361,7 +361,7 @@
         };
     };
 
-    common.boot_jdk_version = "10";
+    common.boot_jdk_version = "11";
     common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -851,9 +851,10 @@
             server: "jpg",
             product: "jdk",
             version: common.boot_jdk_version,
-            build_number: "46",
+            build_number: "28",
             file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
-                + boot_jdk_platform + "_bin.tar.gz",
+                + boot_jdk_platform + "_bin"
+		+ (input.build_os == "windows" ? ".zip" : ".tar.gz"),
             configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
             environment_path: common.boot_jdk_home + "/bin"
         },