From eece20b34bc55ed73e28dc4b806f14f5c9d90eee Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Tue, 3 Nov 2020 21:26:14 +0000
Subject: [PATCH] 8255714: Switch FX build to use JDK 15.0.1 as boot JDK

Reviewed-by: jvos, arapte
---
 .github/workflows/submit.yml | 18 +++++++++---------
 build.properties             |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 25dd482a767..ac6a8e55f6c 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -58,9 +58,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "15"
-      BOOT_JDK_FILENAME: "openjdk-15_linux-x64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_linux-x64_bin.tar.gz"
+      BOOT_JDK_VERSION: "15.0.1"
+      BOOT_JDK_FILENAME: "openjdk-15.0.1_linux-x64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_linux-x64_bin.tar.gz"
 
     steps:
       - name: Checkout the source
@@ -129,9 +129,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "15"
-      BOOT_JDK_FILENAME: "openjdk-15_osx-x64_bin.tar.gz"
-      BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_osx-x64_bin.tar.gz"
+      BOOT_JDK_VERSION: "15.0.1"
+      BOOT_JDK_FILENAME: "openjdk-15.0.1_osx-x64_bin.tar.gz"
+      BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_osx-x64_bin.tar.gz"
 
     steps:
       - name: Checkout the source
@@ -200,9 +200,9 @@ jobs:
       # BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
       # BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
       # BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
-      BOOT_JDK_VERSION: "15"
-      BOOT_JDK_FILENAME: "openjdk-15_windows-x64_bin.zip"
-      BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_windows-x64_bin.zip"
+      BOOT_JDK_VERSION: "15.0.1"
+      BOOT_JDK_FILENAME: "openjdk-15.0.1_windows-x64_bin.zip"
+      BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_windows-x64_bin.zip"
       # FIXME: hard-code the location and version of VS 2019 for now
       VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build"
       MSVC_VER: "14.27.29110"
diff --git a/build.properties b/build.properties
index ad0efc080d1..9c9ea1b40f7 100644
--- a/build.properties
+++ b/build.properties
@@ -73,8 +73,8 @@ javadoc.header=JavaFX&nbsp;16
 ##############################################################################
 
 # JDK
-jfx.build.jdk.version=15
-jfx.build.jdk.buildnum=36
+jfx.build.jdk.version=15.0.1
+jfx.build.jdk.buildnum=9
 jfx.build.jdk.version.min=11
 jfx.build.jdk.buildnum.min=28