Merge branch '3.5.x'

Closes gh-46354

Author: philwebb

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

@@ -17,6 +17,7 @@
 package org.springframework.boot.build;
 
 import org.gradle.api.Project;
+import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.plugins.ide.api.XmlFileContentMerger;
 import org.gradle.plugins.ide.eclipse.EclipsePlugin;
 import org.gradle.plugins.ide.eclipse.model.Classpath;
@@ -34,10 +35,12 @@
 class EclipseConventions {
 
 	void apply(Project project) {
-		project.getPlugins().withType(EclipsePlugin.class, (eclipse) -> {
-			EclipseModel eclipseModel = project.getExtensions().getByType(EclipseModel.class);
-			eclipseModel.classpath(this::configureClasspath);
-		});
+		project.getPlugins()
+			.withType(EclipsePlugin.class,
+					(eclipse) -> project.getPlugins().withType(JavaBasePlugin.class, (javaBase) -> {
+						EclipseModel eclipseModel = project.getExtensions().getByType(EclipseModel.class);
+						eclipseModel.classpath(this::configureClasspath);
+					}));
 	}
 
 	private void configureClasspath(EclipseClasspath classpath) {