From f1118580558e9ab98e31fa42493c0dda5ca2e8d5 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Fri, 13 Jun 2025 00:49:05 +0200 Subject: [PATCH] Relax Java 24 toolchain requirements While we choose our GitHub action to use Bellsoft Liberica, we should relax that vendor requirement and ensure that contributors can build the project with any Java 24 distribution. Closes gh-35043 --- .../main/java/org/springframework/build/JavaConventions.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/build/JavaConventions.java index 634f1ce592..1cf2574cac 100644 --- a/buildSrc/src/main/java/org/springframework/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/JavaConventions.java @@ -26,7 +26,6 @@ import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.jvm.toolchain.JavaLanguageVersion; -import org.gradle.jvm.toolchain.JvmVendorSpec; /** * {@link Plugin} that applies conventions for compiling Java sources in Spring Framework. @@ -86,7 +85,6 @@ public class JavaConventions { */ private static void applyToolchainConventions(Project project) { project.getExtensions().getByType(JavaPluginExtension.class).toolchain(toolchain -> { - toolchain.getVendor().set(JvmVendorSpec.BELLSOFT); toolchain.getLanguageVersion().set(DEFAULT_LANGUAGE_VERSION); }); }