From 2998e846162fe9f69b990bf99b198d1463e53496 Mon Sep 17 00:00:00 2001
From: BenchmarkingBuffalo
 <46448799+BenchmarkingBuffalo@users.noreply.github.com>
Date: Tue, 12 Aug 2025 22:11:54 +0200
Subject: [PATCH 1/2] Fail fast with explicit error message for incompatible
 JDK version

See gh-46818

Signed-off-by: BenchmarkingBuffalo <46448799+BenchmarkingBuffalo@users.noreply.github.com>
---
 settings.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index 8496e2ac059..7649502e54c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -47,6 +47,11 @@ rootProject.name="spring-boot-build"
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
 settings.gradle.projectsLoaded {
+	ensureCompatibleJavaVersion -> {
+		if (!JavaVersion.current().isCompatibleWith(JavaVersion.toVersion(24))) {
+			throw new GradleException("Java 24 or newer is needed to compile. Java version used is ${JavaVersion.current().toString()}.")
+		}
+	}
 	develocity {
 		buildScan {
 			def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')

From afc24aed1c3de8b4686020256a86e5351162c8e0 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Mon, 17 Nov 2025 14:50:13 +0100
Subject: [PATCH 2/2] Polish "Fail fast with explicit error message for
 incompatible JDK version"

See gh-46818
---
 buildSrc/build.gradle | 4 ++++
 settings.gradle       | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 120f1f96e6e..f0d7317126d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -22,6 +22,10 @@ plugins {
 	id "org.jetbrains.dokka" version "2.1.0"
 }
 
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_24)) {
+	throw new GradleException("This build requires Java 24 or newer to run, but you are currently using Java ${JavaVersion.current()}")
+}
+
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
diff --git a/settings.gradle b/settings.gradle
index 7649502e54c..8496e2ac059 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -47,11 +47,6 @@ rootProject.name="spring-boot-build"
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
 settings.gradle.projectsLoaded {
-	ensureCompatibleJavaVersion -> {
-		if (!JavaVersion.current().isCompatibleWith(JavaVersion.toVersion(24))) {
-			throw new GradleException("Java 24 or newer is needed to compile. Java version used is ${JavaVersion.current().toString()}.")
-		}
-	}
 	develocity {
 		buildScan {
 			def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')