From 49ef150c5dd225634df4160fcaec28e301ca3139 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 17 Apr 2025 18:12:06 +0200 Subject: [PATCH] Configure JDK 24 toolchain for aggregated Javadoc Changes made in conjunction with #27497 now require that we generate Javadoc with JDK 18 or higher in order to make use of the "--link-modularity-mismatch" flag for the javadoc executable. This commit sets the toolchain for the javadoc task in the framework-api module to use JDK 24 for generating Javadoc. The common javadoc task used by all spring-* modules will be addressed in a separate commit. See gh-27497 See gh-34774 --- framework-api/framework-api.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle index e14fa97976c..85484622370 100644 --- a/framework-api/framework-api.gradle +++ b/framework-api/framework-api.gradle @@ -20,6 +20,10 @@ dependencies { } javadoc { + javadocTool.set(javaToolchains.javadocToolFor({ + languageVersion = JavaLanguageVersion.of(24) + })) + title = "${rootProject.description} ${version} API" options { encoding = "UTF-8"