lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-09-27 23:07:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Do not add snapshot repo unless absolutely necessary"

Browse Source 
See gh-960
This commit is contained in:
Stephane Nicoll
2019-07-25 12:20:15 +02:00
parent c54ec295bf
commit a92c791c32
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
+16 -8
View File
@@ -39,17 +39,25 @@ class SpringBootVersionRepositoriesBuildCustomizer implements BuildCustomizer<Bu
build.repositories().add("maven-central"); build.repositories().add("maven-central");
String qualifier = this.springBootVersion.getQualifier().getQualifier(); String qualifier = this.springBootVersion.getQualifier().getQualifier();
if (!"RELEASE".equals(qualifier)) { if (!"RELEASE".equals(qualifier)) {
addMilestoneRepository(build);
if ("BUILD-SNAPSHOT".equals(qualifier)) { if ("BUILD-SNAPSHOT".equals(qualifier)) {
MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots", addSnapshotRepository(build);
"https://repo.spring.io/snapshot", true);
build.repositories().add(snapshotRepository);
build.pluginRepositories().add(snapshotRepository);
} }
MavenRepository milestoneRepository = new MavenRepository("spring-milestones", "Spring Milestones",
"https://repo.spring.io/milestone");
build.repositories().add(milestoneRepository);
build.pluginRepositories().add(milestoneRepository);
} }
} }
private void addSnapshotRepository(Build build) {
MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots",
"https://repo.spring.io/snapshot", true);
build.repositories().add(snapshotRepository);
build.pluginRepositories().add(snapshotRepository);
}
private void addMilestoneRepository(Build build) {
MavenRepository milestoneRepository = new MavenRepository("spring-milestones", "Spring Milestones",
"https://repo.spring.io/milestone");
build.repositories().add(milestoneRepository);
build.pluginRepositories().add(milestoneRepository);
}
} }
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
+5 -5
View File
@@ -65,14 +65,14 @@ class SpringBootVersionRepositoriesBuildCustomizerTests {
List<MavenRepository> repositories = build.repositories().items().collect(Collectors.toList()); List<MavenRepository> repositories = build.repositories().items().collect(Collectors.toList());
assertThat(repositories).hasSize(3); assertThat(repositories).hasSize(3);
assertThat(repositories.get(0)).isEqualTo(MavenRepository.MAVEN_CENTRAL); assertThat(repositories.get(0)).isEqualTo(MavenRepository.MAVEN_CENTRAL);
assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-snapshots") assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-milestones")
.hasFieldOrPropertyWithValue("name", "Spring Snapshots")
.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/snapshot")
.hasFieldOrPropertyWithValue("snapshotsEnabled", true);
assertThat(repositories.get(2)).hasFieldOrPropertyWithValue("id", "spring-milestones")
.hasFieldOrPropertyWithValue("name", "Spring Milestones") .hasFieldOrPropertyWithValue("name", "Spring Milestones")
.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/milestone") .hasFieldOrPropertyWithValue("url", "https://repo.spring.io/milestone")
.hasFieldOrPropertyWithValue("snapshotsEnabled", false); .hasFieldOrPropertyWithValue("snapshotsEnabled", false);
assertThat(repositories.get(2)).hasFieldOrPropertyWithValue("id", "spring-snapshots")
.hasFieldOrPropertyWithValue("name", "Spring Snapshots")
.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/snapshot")
.hasFieldOrPropertyWithValue("snapshotsEnabled", true);
} }
private void assertMavenCentralAndMilestonesRepositories(MavenBuild build) { private void assertMavenCentralAndMilestonesRepositories(MavenBuild build) {