Skip to content

Commit eece20b

Browse files
8255714: Switch FX build to use JDK 15.0.1 as boot JDK
Reviewed-by: jvos, arapte
1 parent c31ed6b commit eece20b

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/submit.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ jobs:
5858
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
5959
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
6060
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
61-
BOOT_JDK_VERSION: "15"
62-
BOOT_JDK_FILENAME: "openjdk-15_linux-x64_bin.tar.gz"
63-
BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_linux-x64_bin.tar.gz"
61+
BOOT_JDK_VERSION: "15.0.1"
62+
BOOT_JDK_FILENAME: "openjdk-15.0.1_linux-x64_bin.tar.gz"
63+
BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_linux-x64_bin.tar.gz"
6464

6565
steps:
6666
- name: Checkout the source
@@ -129,9 +129,9 @@ jobs:
129129
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
130130
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
131131
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
132-
BOOT_JDK_VERSION: "15"
133-
BOOT_JDK_FILENAME: "openjdk-15_osx-x64_bin.tar.gz"
134-
BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_osx-x64_bin.tar.gz"
132+
BOOT_JDK_VERSION: "15.0.1"
133+
BOOT_JDK_FILENAME: "openjdk-15.0.1_osx-x64_bin.tar.gz"
134+
BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_osx-x64_bin.tar.gz"
135135

136136
steps:
137137
- name: Checkout the source
@@ -200,9 +200,9 @@ jobs:
200200
# BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_FILENAME }}"
201201
# BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_URL }}"
202202
# BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).LINUX_X64_BOOT_JDK_SHA256 }}"
203-
BOOT_JDK_VERSION: "15"
204-
BOOT_JDK_FILENAME: "openjdk-15_windows-x64_bin.zip"
205-
BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_windows-x64_bin.zip"
203+
BOOT_JDK_VERSION: "15.0.1"
204+
BOOT_JDK_FILENAME: "openjdk-15.0.1_windows-x64_bin.zip"
205+
BOOT_JDK_URL: "https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_windows-x64_bin.zip"
206206
# FIXME: hard-code the location and version of VS 2019 for now
207207
VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build"
208208
MSVC_VER: "14.27.29110"

build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ javadoc.header=JavaFX 16
7373
##############################################################################
7474

7575
# JDK
76-
jfx.build.jdk.version=15
77-
jfx.build.jdk.buildnum=36
76+
jfx.build.jdk.version=15.0.1
77+
jfx.build.jdk.buildnum=9
7878
jfx.build.jdk.version.min=11
7979
jfx.build.jdk.buildnum.min=28
8080

0 commit comments

Comments
 (0)