changeset 55545:c12b897021ea

8221414: Bump required boot jdk version to 12 Reviewed-by: mikael, tbell
author erikj
date Tue, 26 Mar 2019 09:24:01 -0700
parents c02b8d6384ab
children 6183f835b9b6
files make/autoconf/version-numbers make/conf/jib-profiles.js
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/autoconf/version-numbers	Tue Mar 26 15:52:08 2019 +0100
+++ b/make/autoconf/version-numbers	Tue Mar 26 09:24:01 2019 -0700
@@ -35,7 +35,7 @@
 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
--- a/make/conf/jib-profiles.js	Tue Mar 26 15:52:08 2019 +0100
+++ b/make/conf/jib-profiles.js	Tue Mar 26 09:24:01 2019 -0700
@@ -365,7 +365,8 @@
         };
     };
 
-    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 @@
             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,