lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-26 05:32:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove useless resolutionStrategy for Spring Boot plugin

Browse Source 
Closes gh-610
This commit is contained in:
Stephane Nicoll
2021-01-11 16:56:50 +01:00
parent 9f1de5d87b
commit c4485b6cbd
3 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriter.java
View File

@@ -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()";

12
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleSettingsWriterTests.java
View File

@@ -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<String> 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<String> 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

12
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleSettingsWriterTests.java
View File

@@ -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<String> 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<String> 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