From c4485b6cbd49893dce0ec06bb5e53adbfb56c780 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Jan 2021 16:56:50 +0100 Subject: [PATCH] Remove useless resolutionStrategy for Spring Boot plugin Closes gh-610 --- .../gradle/GradleSettingsWriter.java | 25 ++----------------- .../GroovyDslGradleSettingsWriterTests.java | 12 +++------ .../KotlinDslGradleSettingsWriterTests.java | 12 +++------ 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriter.java index c6167965..e832774e 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,10 +45,7 @@ public abstract class GradleSettingsWriter { return; } writer.println("pluginManagement {"); - writer.indented(() -> { - writeRepositories(writer, build); - writeResolutionStrategyIfNecessary(writer, build); - }); + writer.indented(() -> writeRepositories(writer, build)); writer.println("}"); } @@ -61,24 +58,6 @@ public abstract class GradleSettingsWriter { writer.println("}"); } - private void writeResolutionStrategyIfNecessary(IndentingWriter writer, GradleBuild build) { - if (build.pluginRepositories().items().allMatch(MavenRepository.MAVEN_CENTRAL::equals)) { - return; - } - writer.println("resolutionStrategy {"); - writer.indented(() -> { - writer.println("eachPlugin {"); - writer.indented(() -> { - writer.println("if (requested.id.id == " + wrapWithQuotes("org.springframework.boot") + ") {"); - writer.indented(() -> writer.println( - "useModule(\"org.springframework.boot:spring-boot-gradle-plugin:${requested.version}\")")); - writer.println("}"); - }); - writer.println("}"); - }); - writer.println("}"); - } - private String repositoryAsString(MavenRepository repository) { if (MavenRepository.MAVEN_CENTRAL.equals(repository)) { return "mavenCentral()"; diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleSettingsWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleSettingsWriterTests.java index a01dd0de..2f60ffb3 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleSettingsWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleSettingsWriterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,10 +58,7 @@ class GroovyDslGradleSettingsWriterTests { List lines = generateSettings(build); assertThat(lines).containsSequence("pluginManagement {", " repositories {", " maven { url 'https://repo.spring.io/milestone' }", " gradlePluginPortal()", " }", - " resolutionStrategy {", " eachPlugin {", - " if (requested.id.id == 'org.springframework.boot') {", - " useModule(\"org.springframework.boot:spring-boot-gradle-plugin:${requested.version}\")", - " }", " }", " }", "}"); + "}"); } @Test @@ -73,10 +70,7 @@ class GroovyDslGradleSettingsWriterTests { List lines = generateSettings(build); assertThat(lines).containsSequence("pluginManagement {", " repositories {", " maven { url 'https://repo.spring.io/snapshot' }", " gradlePluginPortal()", " }", - " resolutionStrategy {", " eachPlugin {", - " if (requested.id.id == 'org.springframework.boot') {", - " useModule(\"org.springframework.boot:spring-boot-gradle-plugin:${requested.version}\")", - " }", " }", " }", "}"); + "}"); } @Test diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleSettingsWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleSettingsWriterTests.java index a891dc6f..70f89db5 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleSettingsWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleSettingsWriterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,10 +57,7 @@ class KotlinDslGradleSettingsWriterTests { List lines = generateSettings(build); assertThat(lines).containsSequence("pluginManagement {", " repositories {", " maven { url = uri(\"https://repo.spring.io/milestone\") }", " gradlePluginPortal()", - " }", " resolutionStrategy {", " eachPlugin {", - " if (requested.id.id == \"org.springframework.boot\") {", - " useModule(\"org.springframework.boot:spring-boot-gradle-plugin:${requested.version}\")", - " }", " }", " }", "}"); + " }", "}"); } @Test @@ -72,10 +69,7 @@ class KotlinDslGradleSettingsWriterTests { List lines = generateSettings(build); assertThat(lines).containsSequence("pluginManagement {", " repositories {", " maven { url = uri(\"https://repo.spring.io/snapshot\") }", " gradlePluginPortal()", - " }", " resolutionStrategy {", " eachPlugin {", - " if (requested.id.id == \"org.springframework.boot\") {", - " useModule(\"org.springframework.boot:spring-boot-gradle-plugin:${requested.version}\")", - " }", " }", " }", "}"); + " }", "}"); } @Test