Merge branch '3.3.x' into 3.4.x

Author: philwebb

buildSrc/SpringRepositorySupport.groovy

@@ -135,11 +135,11 @@ class SpringRepositoriesExtension {
 		this.repositories.maven { maven ->
 			maven.setName(name)
 			maven.setUrl(url)
-			maven.content { content ->
+			maven.mavenContent { mavenContent ->
 				if (snapshot) {
-					content.snapshotsOnly()
+					mavenContent.snapshotsOnly()
 				} else {
-					content.releasesOnly()
+					mavenContent.releasesOnly()
 				}
 			}
 			action(maven)

buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java

@@ -119,9 +119,8 @@ private List<MavenArtifactRepository> getSpringRepositories() {
 			.toList());
 		Function<MavenArtifactRepository, Boolean> bySnapshots = (repository) -> repository.getName()
 			.contains("snapshot");
-		Function<MavenArtifactRepository, String> byName = null;
+		Function<MavenArtifactRepository, String> byName = MavenArtifactRepository::getName;
 		Collections.sort(springRepositories, Comparator.comparing(bySnapshots).thenComparing(byName));
-		System.err.println(">>>> " + springRepositories);
 		return springRepositories;
 	}
 

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

@@ -31,6 +31,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
+import org.gradle.api.artifacts.repositories.MavenRepositoryContentDescriptor;
 import org.gradle.api.artifacts.repositories.PasswordCredentials;
 import org.gradle.api.artifacts.repositories.RepositoryContentDescriptor;
 import org.junit.jupiter.api.AfterAll;
@@ -73,15 +74,19 @@ static void cleanup() throws Exception {
 
 	private final List<PasswordCredentials> credentials = new ArrayList<>();
 
+	private final List<MavenRepositoryContentDescriptor> mavenContent = new ArrayList<>();
+
 	@Test
 	void mavenRepositoriesWhenNotCommercialSnapshot() {
 		SpringRepositoriesExtension extension = createExtension("0.0.0-SNAPSHOT", "oss");
 		extension.mavenRepositories();
 		assertThat(this.repositories).hasSize(2);
 		verify(this.repositories.get(0)).setName("spring-oss-milestone");
 		verify(this.repositories.get(0)).setUrl("https://repo.spring.io/milestone");
+		verify(this.mavenContent.get(0)).releasesOnly();
 		verify(this.repositories.get(1)).setName("spring-oss-snapshot");
 		verify(this.repositories.get(1)).setUrl("https://repo.spring.io/snapshot");
+		verify(this.mavenContent.get(1)).snapshotsOnly();
 	}
 
 	@Test
@@ -92,12 +97,16 @@ void mavenRepositoriesWhenCommercialSnapshot() {
 		verify(this.repositories.get(0)).setName("spring-commercial-release");
 		verify(this.repositories.get(0))
 			.setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local");
+		verify(this.mavenContent.get(0)).releasesOnly();
 		verify(this.repositories.get(1)).setName("spring-oss-milestone");
 		verify(this.repositories.get(1)).setUrl("https://repo.spring.io/milestone");
+		verify(this.mavenContent.get(1)).releasesOnly();
 		verify(this.repositories.get(2)).setName("spring-commercial-snapshot");
 		verify(this.repositories.get(2)).setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-dev-local");
+		verify(this.mavenContent.get(2)).snapshotsOnly();
 		verify(this.repositories.get(3)).setName("spring-oss-snapshot");
 		verify(this.repositories.get(3)).setUrl("https://repo.spring.io/snapshot");
+		verify(this.mavenContent.get(3)).snapshotsOnly();
 	}
 
 	@Test
@@ -107,6 +116,7 @@ void mavenRepositoriesWhenNotCommercialMilestone() {
 		assertThat(this.repositories).hasSize(1);
 		verify(this.repositories.get(0)).setName("spring-oss-milestone");
 		verify(this.repositories.get(0)).setUrl("https://repo.spring.io/milestone");
+		verify(this.mavenContent.get(0)).releasesOnly();
 	}
 
 	@Test
@@ -117,8 +127,10 @@ void mavenRepositoriesWhenCommercialMilestone() {
 		verify(this.repositories.get(0)).setName("spring-commercial-release");
 		verify(this.repositories.get(0))
 			.setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local");
+		verify(this.mavenContent.get(0)).releasesOnly();
 		verify(this.repositories.get(1)).setName("spring-oss-milestone");
 		verify(this.repositories.get(1)).setUrl("https://repo.spring.io/milestone");
+		verify(this.mavenContent.get(1)).releasesOnly();
 	}
 
 	@Test
@@ -136,6 +148,7 @@ void mavenRepositoriesWhenCommercialRelease() {
 		verify(this.repositories.get(0)).setName("spring-commercial-release");
 		verify(this.repositories.get(0))
 			.setUrl("https://usw1.packages.broadcom.com/spring-enterprise-maven-prod-local");
+		verify(this.mavenContent.get(0)).releasesOnly();
 	}
 
 	@Test
@@ -217,6 +230,7 @@ private Object mavenClosure(InvocationOnMock invocation) {
 		MavenArtifactRepository repository = mock(MavenArtifactRepository.class);
 		willAnswer(this::contentAction).given(repository).content(any(Action.class));
 		willAnswer(this::credentialsAction).given(repository).credentials(any(Action.class));
+		willAnswer(this::mavenContentAction).given(repository).mavenContent(any(Action.class));
 		Closure<MavenArtifactRepository> closure = invocation.getArgument(0);
 		closure.call(repository);
 		this.repositories.add(repository);
@@ -239,6 +253,14 @@ private Object credentialsAction(InvocationOnMock invocation) {
 		return null;
 	}
 
+	private Object mavenContentAction(InvocationOnMock invocation) {
+		MavenRepositoryContentDescriptor mavenContent = mock(MavenRepositoryContentDescriptor.class);
+		Action<MavenRepositoryContentDescriptor> action = invocation.getArgument(0);
+		action.execute(mavenContent);
+		this.mavenContent.add(mavenContent);
+		return null;
+	}
+
 	interface SpringRepositoriesExtension {
 
 		void mavenRepositories();