Skip to content

Commit 29f0a41

Browse files
committed
Merge branch '3.5.x'
Closes gh-46354
2 parents 626065a + 6cb9d47 commit 29f0a41

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.build;
1818

1919
import org.gradle.api.Project;
20+
import org.gradle.api.plugins.JavaBasePlugin;
2021
import org.gradle.plugins.ide.api.XmlFileContentMerger;
2122
import org.gradle.plugins.ide.eclipse.EclipsePlugin;
2223
import org.gradle.plugins.ide.eclipse.model.Classpath;
@@ -34,10 +35,12 @@
3435
class EclipseConventions {
3536

3637
void apply(Project project) {
37-
project.getPlugins().withType(EclipsePlugin.class, (eclipse) -> {
38-
EclipseModel eclipseModel = project.getExtensions().getByType(EclipseModel.class);
39-
eclipseModel.classpath(this::configureClasspath);
40-
});
38+
project.getPlugins()
39+
.withType(EclipsePlugin.class,
40+
(eclipse) -> project.getPlugins().withType(JavaBasePlugin.class, (javaBase) -> {
41+
EclipseModel eclipseModel = project.getExtensions().getByType(EclipseModel.class);
42+
eclipseModel.classpath(this::configureClasspath);
43+
}));
4144
}
4245

4346
private void configureClasspath(EclipseClasspath classpath) {

0 commit comments

Comments
 (0)