Browse Source

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
pull/35045/head
Brian Clozel 6 months ago
parent
commit
f111858055
  1. 2
      buildSrc/src/main/java/org/springframework/build/JavaConventions.java

2
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.plugins.JavaPluginExtension;
import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.compile.JavaCompile;
import org.gradle.jvm.toolchain.JavaLanguageVersion; import org.gradle.jvm.toolchain.JavaLanguageVersion;
import org.gradle.jvm.toolchain.JvmVendorSpec;
/** /**
* {@link Plugin} that applies conventions for compiling Java sources in Spring Framework. * {@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) { private static void applyToolchainConventions(Project project) {
project.getExtensions().getByType(JavaPluginExtension.class).toolchain(toolchain -> { project.getExtensions().getByType(JavaPluginExtension.class).toolchain(toolchain -> {
toolchain.getVendor().set(JvmVendorSpec.BELLSOFT);
toolchain.getLanguageVersion().set(DEFAULT_LANGUAGE_VERSION); toolchain.getLanguageVersion().set(DEFAULT_LANGUAGE_VERSION);
}); });
} }

Loading…
Cancel
Save