Improve how system requirements config affects Eclipse

See gh-48684

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -52,7 +52,6 @@
 import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.api.tasks.testing.Test;
 import org.gradle.external.javadoc.CoreJavadocOptions;
-import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 import org.springframework.boot.build.SystemRequirementsExtension.JavaSpec;
 import org.springframework.boot.build.architecture.ArchitecturePlugin;
@@ -170,7 +169,7 @@ private void configureJarManifestConventions(Project project) {
 			jar.manifest((manifest) -> {
 				Map<String, Object> attributes = new TreeMap<>();
 				attributes.put("Automatic-Module-Name", project.getName().replace("-", "."));
-				attributes.put("Build-Jdk-Spec", this.javaSpec.getVersion().get().toString());
+				attributes.put("Build-Jdk-Spec", this.javaSpec.getVersion());
 				attributes.put("Built-By", "Spring");
 				attributes.put("Implementation-Title",
 						determineImplementationTitle(project, sourceJarTaskNames, javadocJarTaskNames, jar));
@@ -248,15 +247,9 @@ private void addValuelessOption(CoreJavadocOptions options, String option) {
 	}
 
 	private void configureJavaConventions(Project project) {
-		JavaLanguageVersion javaVersion = this.javaSpec.getVersion().get();
-		if (!project.hasProperty("toolchainVersion")) {
-			JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
-			javaPluginExtension.setSourceCompatibility(javaVersion);
-			javaPluginExtension.setTargetCompatibility(javaVersion);
-		}
 		project.getTasks().withType(JavaCompile.class, (compile) -> {
 			compile.getOptions().setEncoding("UTF-8");
-			compile.getOptions().getRelease().set(javaVersion.asInt());
+			compile.getOptions().getRelease().set(this.javaSpec.getVersion());
 			List<String> args = compile.getOptions().getCompilerArgs();
 			if (!args.contains("-parameters")) {
 				args.add("-parameters");

buildSrc/src/main/java/org/springframework/boot/build/SystemRequirementsExtension.java

@@ -19,8 +19,9 @@
 import javax.inject.Inject;
 
 import org.gradle.api.Action;
+import org.gradle.api.Project;
 import org.gradle.api.model.ObjectFactory;
-import org.gradle.api.provider.Property;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 /**
@@ -33,8 +34,8 @@ public class SystemRequirementsExtension {
 	private final JavaSpec javaSpec;
 
 	@Inject
-	public SystemRequirementsExtension(ObjectFactory objects) {
-		this.javaSpec = objects.newInstance(JavaSpec.class);
+	public SystemRequirementsExtension(Project project, ObjectFactory objects) {
+		this.javaSpec = objects.newInstance(JavaSpec.class, project);
 	}
 
 	public void java(Action<JavaSpec> action) {
@@ -47,11 +48,26 @@ public JavaSpec getJava() {
 
 	public abstract static class JavaSpec {
 
-		public JavaSpec() {
-			getVersion().convention(JavaLanguageVersion.of(17));
+		private final Project project;
+
+		private int version = 17;
+
+		@Inject
+		public JavaSpec(Project project) {
+			this.project = project;
 		}
 
-		public abstract Property<JavaLanguageVersion> getVersion();
+		public int getVersion() {
+			return this.version;
+		}
+
+		public void setVersion(int version) {
+			JavaLanguageVersion javaVersion = JavaLanguageVersion.of(version);
+			JavaPluginExtension javaPluginExtension = this.project.getExtensions().getByType(JavaPluginExtension.class);
+			javaPluginExtension.setSourceCompatibility(javaVersion);
+			javaPluginExtension.setTargetCompatibility(javaVersion);
+			this.version = version;
+		}
 
 	}
 

buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainExtension.java

@@ -37,7 +37,8 @@ public ToolchainExtension(Project project) {
 		String toolchainVersion = (String) project.findProperty("toolchainVersion");
 		this.javaVersion = (toolchainVersion != null) ? JavaLanguageVersion.of(toolchainVersion) : null;
 		JavaSpec javaSpec = project.getExtensions().getByType(SystemRequirementsExtension.class).getJava();
-		getMinimumCompatibleJavaVersion().convention(javaSpec.getVersion());
+		getMinimumCompatibleJavaVersion()
+			.convention(project.provider(() -> JavaLanguageVersion.of(javaSpec.getVersion())));
 	}
 
 	public abstract Property<JavaLanguageVersion> getMinimumCompatibleJavaVersion();

module/spring-boot-jooq-test/build.gradle

@@ -25,7 +25,7 @@ description = "Spring Boot jOOQ Test"
 
 systemRequirements {
 	java {
-		version = JavaLanguageVersion.of(21)
+		version = 21
 	}
 }
 

module/spring-boot-jooq/build.gradle

@@ -26,7 +26,7 @@ description = "Spring Boot jOOQ"
 
 systemRequirements {
 	java {
-		version = JavaLanguageVersion.of(21)
+		version = 21
 	}
 }