Skip to content

Commit e30d0d5

Browse files
8345136: Update JDK_DOCS property to point to JDK 23 docs
Reviewed-by: angorya, sykora, arapte
1 parent 5279be6 commit e30d0d5

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ void setFileTimestamps(Provider<RegularFile> archive, Instant instant) {
303303
* *
304304
*****************************************************************************/
305305

306+
loadProperties("$projectDir/build.properties")
307+
306308
// If the ../rt-closed directory exists, then we are doing a closed build.
307309
// In this case, build and property files will be read from
308310
// ../rt-closed/closed-build.gradle and ../rt-closed/closed-properties.gradle
@@ -396,15 +398,13 @@ defineProperty("JAVA", cygpathExe("$JDK_HOME/bin/java"))
396398
defineProperty("JAVAC", cygpathExe("$JDK_HOME/bin/javac"))
397399
defineProperty("JAVADOC", cygpathExe("$JDK_HOME/bin/javadoc"))
398400
defineProperty("JMOD", cygpathExe("$JDK_HOME/bin/jmod"))
399-
defineProperty("JDK_DOCS", "https://docs.oracle.com/en/java/javase/21/docs/api/")
401+
defineProperty("JDK_DOCS", "https://docs.oracle.com/en/java/javase/${jdkDocsVersion}/docs/api/")
400402
defineProperty("JDK_JMODS", cygpath(System.getenv("JDK_JMODS")) ?: cygpath(System.getenv("JDK_HOME") + "/jmods"))
401403

402404
defineProperty("libAVRepositoryURL", "https://github.com/libav/libav/archive")
403405
defineProperty("FFmpegRepositoryURL", "https://www.ffmpeg.org/releases/")
404406
defineProperty("icuRepositoryURL", "https://github.com/unicode-org/icu/releases/")
405407

406-
loadProperties("$projectDir/build.properties")
407-
408408
def supplementalPreBuildFile = file("$closedDir/closed-pre-build.gradle");
409409
def supplementalBuildFile = file("$closedDir/closed-build.gradle");
410410

build.properties

+5
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ javadoc.top=<div style="padding: 6px; text-align: center; font-size: 80%;">This
7373
# compile FX. This variable is read by the Hudson build scripts to
7474
# select the JDK.
7575
#
76+
# jdk.docs.version should be set to the JDK feature version used for
77+
# javadoc links to JDK classes from JavaFX classes. It is typically the
78+
# feature version corresponding to the JDK used to compile JavaFX.
79+
#
7680
# jfx.build.jdk.buildnum.min should be set to the lowest version that
7781
# supports building FX (which must be <= jfx.build.jdk.buildnum)
7882
#
@@ -83,6 +87,7 @@ javadoc.top=<div style="padding: 6px; text-align: center; font-size: 80%;">This
8387
##############################################################################
8488

8589
# JDK
90+
jdk.docs.version=23
8691
jfx.build.jdk.version=23
8792
jfx.build.jdk.buildnum=37
8893
jfx.build.jdk.version.min=22

gradle/verification-metadata.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
<sha256 value="2a8df69e6035788f8b9b20d23beaf3e5cbc64f17c78e9012db1689b677e712dd" origin="Generated by Gradle"/>
136136
</artifact>
137137
</component>
138-
<component group="javafx" name="jdk-21_doc" version="all">
139-
<artifact name="jdk-21_doc-all.zip">
140-
<sha256 value="e85811ad50e9e9b5665700daa7bbdda456f1fb047eb5b222629d4431d983863b" origin="Generated by Gradle"/>
138+
<component group="javafx" name="jdk-23_doc" version="all">
139+
<artifact name="jdk-23_doc-all.zip">
140+
<sha256 value="bcb93d726121f31162f8e76c434e8ca7995f98f27d88171aa917233f15ddbfa6" origin="Generated by Gradle"/>
141141
</artifact>
142142
</component>
143143
<component group="javafx" name="jfx-devkit-gcc" version="patch+1.1.tar">

0 commit comments

Comments
 (0)