From c54ec295bf685c26c1616db79a8cd6c59acffcb0 Mon Sep 17 00:00:00 2001
From: HaiTao Zhang <hazhang@pivotal.io>
Date: Wed, 24 Jul 2019 15:01:14 -0700
Subject: [PATCH 1/2] Do not add snapshot repo unless absolutely necessary

See gh-960
---
 ...BootVersionRepositoriesBuildCustomizer.java | 11 ++++++-----
 ...ersionRepositoriesBuildCustomizerTests.java | 18 ++++++++++++++----
 .../repositories-milestone-build.gradle.gen    |  1 -
 ...repositories-milestone-build.gradle.kts.gen |  1 -
 .../maven/repositories-milestone-pom.xml.gen   | 16 ----------------
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
index f90b7a39..df0c5cf3 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
@@ -39,16 +39,17 @@ class SpringBootVersionRepositoriesBuildCustomizer implements BuildCustomizer<Bu
 		build.repositories().add("maven-central");
 		String qualifier = this.springBootVersion.getQualifier().getQualifier();
 		if (!"RELEASE".equals(qualifier)) {
-			MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots",
-					"https://repo.spring.io/snapshot", true);
-			build.repositories().add(snapshotRepository);
-			build.pluginRepositories().add(snapshotRepository);
+			if ("BUILD-SNAPSHOT".equals(qualifier)) {
+				MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots",
+						"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);
 		}
-
 	}
 
 }
diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
index 48e7e8d8..9f2167db 100644
--- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
+++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
@@ -41,17 +41,17 @@ class SpringBootVersionRepositoriesBuildCustomizerTests {
 	}
 
 	@Test
-	void addMavenCentralAndNonReleaseWhenUsingMilestone() {
+	void addMavenCentralAndMilestonesWhenUsingMilestone() {
 		MavenBuild build = new MavenBuild();
 		new SpringBootVersionRepositoriesBuildCustomizer(Version.parse("2.1.0.M1")).customize(build);
-		assertNonReleaseRepositories(build);
+		assertMavenCentralAndMilestonesRepositories(build);
 	}
 
 	@Test
-	void addMavenCentralAndNonReleaseWhenUsingReleaseCandidate() {
+	void addMavenCentralAndMilestonesWhenUsingReleaseCandidate() {
 		MavenBuild build = new MavenBuild();
 		new SpringBootVersionRepositoriesBuildCustomizer(Version.parse("2.1.0.RC1")).customize(build);
-		assertNonReleaseRepositories(build);
+		assertMavenCentralAndMilestonesRepositories(build);
 	}
 
 	@Test
@@ -75,4 +75,14 @@ class SpringBootVersionRepositoriesBuildCustomizerTests {
 				.hasFieldOrPropertyWithValue("snapshotsEnabled", false);
 	}
 
+	private void assertMavenCentralAndMilestonesRepositories(MavenBuild build) {
+		List<MavenRepository> repositories = build.repositories().items().collect(Collectors.toList());
+		assertThat(repositories).hasSize(2);
+		assertThat(repositories.get(0)).isEqualTo(MavenRepository.MAVEN_CENTRAL);
+		assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-milestones")
+				.hasFieldOrPropertyWithValue("name", "Spring Milestones")
+				.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/milestone")
+				.hasFieldOrPropertyWithValue("snapshotsEnabled", false);
+	}
+
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
index c4d70620..d7941d56 100644
--- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
+++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
@@ -11,7 +11,6 @@ sourceCompatibility = '1.8'
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/snapshot' }
 	maven { url 'https://repo.spring.io/milestone' }
 }
 
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen
index 522af7be..45144a3d 100644
--- a/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen
+++ b/initializr-generator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen
@@ -10,7 +10,6 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
 	mavenCentral()
-	maven { url = uri("https://repo.spring.io/snapshot") }
 	maven { url = uri("https://repo.spring.io/milestone") }
 }
 
diff --git a/initializr-generator-spring/src/test/resources/project/maven/repositories-milestone-pom.xml.gen b/initializr-generator-spring/src/test/resources/project/maven/repositories-milestone-pom.xml.gen
index 06d73f11..81a1f054 100644
--- a/initializr-generator-spring/src/test/resources/project/maven/repositories-milestone-pom.xml.gen
+++ b/initializr-generator-spring/src/test/resources/project/maven/repositories-milestone-pom.xml.gen
@@ -41,14 +41,6 @@
 	</build>
 
 	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
 		<repository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
@@ -56,14 +48,6 @@
 		</repository>
 	</repositories>
 	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
 		<pluginRepository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>

From a92c791c322cd6469f7feb72e9d585ef9fee115e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 25 Jul 2019 12:20:15 +0200
Subject: [PATCH 2/2] Polish "Do not add snapshot repo unless absolutely
 necessary"

See gh-960
---
 ...ootVersionRepositoriesBuildCustomizer.java | 24 ++++++++++++-------
 ...rsionRepositoriesBuildCustomizerTests.java | 10 ++++----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
index df0c5cf3..b812537f 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizer.java
@@ -39,17 +39,25 @@ class SpringBootVersionRepositoriesBuildCustomizer implements BuildCustomizer<Bu
 		build.repositories().add("maven-central");
 		String qualifier = this.springBootVersion.getQualifier().getQualifier();
 		if (!"RELEASE".equals(qualifier)) {
+			addMilestoneRepository(build);
 			if ("BUILD-SNAPSHOT".equals(qualifier)) {
-				MavenRepository snapshotRepository = new MavenRepository("spring-snapshots", "Spring Snapshots",
-						"https://repo.spring.io/snapshot", true);
-				build.repositories().add(snapshotRepository);
-				build.pluginRepositories().add(snapshotRepository);
+				addSnapshotRepository(build);
 			}
-			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);
+	}
+
 }
diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
index 9f2167db..f240fb4f 100644
--- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
+++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SpringBootVersionRepositoriesBuildCustomizerTests.java
@@ -65,14 +65,14 @@ class SpringBootVersionRepositoriesBuildCustomizerTests {
 		List<MavenRepository> repositories = build.repositories().items().collect(Collectors.toList());
 		assertThat(repositories).hasSize(3);
 		assertThat(repositories.get(0)).isEqualTo(MavenRepository.MAVEN_CENTRAL);
-		assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-snapshots")
-				.hasFieldOrPropertyWithValue("name", "Spring Snapshots")
-				.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/snapshot")
-				.hasFieldOrPropertyWithValue("snapshotsEnabled", true);
-		assertThat(repositories.get(2)).hasFieldOrPropertyWithValue("id", "spring-milestones")
+		assertThat(repositories.get(1)).hasFieldOrPropertyWithValue("id", "spring-milestones")
 				.hasFieldOrPropertyWithValue("name", "Spring Milestones")
 				.hasFieldOrPropertyWithValue("url", "https://repo.spring.io/milestone")
 				.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) {