From 952d30f9a90d895fd65c72a70e90daf2b0f3eca0 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 26 Sep 2019 17:04:14 +0200
Subject: [PATCH] Rationalize Spring Boot plugin contribution with Gradle

Closes gh-1010
---
 .../gradle/GradleProjectGenerationConfiguration.java      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java
index d7c9e08d..81056939 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java
@@ -100,7 +100,7 @@ public class GradleProjectGenerationConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnPlatformVersion("2.0.0.M1")
+	@ConditionalOnGradleVersion({ "4", "5" })
 	BuildCustomizer<GradleBuild> springBootPluginContributor(ProjectDescription description,
 			ObjectProvider<DependencyManagementPluginVersionResolver> versionResolver, InitializrMetadata metadata) {
 		return new SpringBootPluginBuildCustomizer(description, versionResolver
@@ -204,12 +204,6 @@ public class GradleProjectGenerationConfiguration {
 					new GroovyDslGradleSettingsWriter(), "settings.gradle");
 		}
 
-		@Bean
-		BuildCustomizer<GradleBuild> springBootPluginContributor(ProjectDescription description) {
-			return (build) -> build.plugins().add("org.springframework.boot",
-					(plugin) -> plugin.setVersion(description.getPlatformVersion().toString()));
-		}
-
 		@Bean
 		@ConditionalOnPlatformVersion("2.2.0.M3")
 		BuildCustomizer<GradleBuild> testTaskContributor() {