Merge branch '3.4.x' into 3.5.x

Author: philwebb

buildSrc/src/test/java/org/springframework/boot/build/groovyscripts/SpringRepositoriesExtensionTests.java

@@ -153,15 +153,15 @@ void mavenRepositoriesWhenCommercialRelease() {
 
 	@Test
 	void mavenRepositoriesWhenConditionMatches() {
-		SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "oss");
-		extension.mavenRepositories(true);
+		SpringRepositoriesExtension extension = createExtension("0.0.0", "oss");
+		extension.mavenRepositoriesFor("1.2.3-SNAPSHOT");
 		assertThat(this.repositories).hasSize(2);
 	}
 
 	@Test
 	void mavenRepositoriesWhenConditionDoesNotMatch() {
 		SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "oss");
-		extension.mavenRepositories(false);
+		extension.mavenRepositoriesFor("1.2.3");
 		assertThat(this.repositories).isEmpty();
 	}
 
@@ -265,7 +265,7 @@ interface SpringRepositoriesExtension {
 
 		void mavenRepositories();
 
-		void mavenRepositories(boolean condition);
+		void mavenRepositoriesFor(Object version);
 
 		void mavenRepositoriesExcludingBootGroup();