Merge branch '3.2.x' into 3.3.x

Closes gh-42688

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

@@ -50,7 +50,7 @@ public class ConventionsPlugin implements Plugin<Project> {
 		new KotlinConventions().apply(project);
 		new WarConventions().apply(project);
 		new EclipseConventions().apply(project);
-		RepoistoryTransformersExtension.apply(project);
+		RepositoryTransformersExtension.apply(project);
 	}
 
 }

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

@@ -23,18 +23,20 @@ import org.gradle.api.Transformer;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 /**
- * Extension to add {@code springRepoistoryTransformers} utility methods.
+ * Extension to add {@code springRepositoryTransformers} utility methods.
  *
  * @author Phillip Webb
  */
-public class RepoistoryTransformersExtension {
+public class RepositoryTransformersExtension {
 
 	private static final String MARKER = "{spring.mavenRepositories}";
 
+	private static final String MARKER_PLUGIN = "{spring.mavenPluginRepositories}";
+
 	private final Project project;
 
 	@Inject
-	public RepoistoryTransformersExtension(Project project) {
+	public RepositoryTransformersExtension(Project project) {
 		this.project = project;
 	}
 
@@ -65,24 +67,32 @@ public class RepoistoryTransformersExtension {
 
 	private String transformMavenSettings(String line) {
 		if (line.contains(MARKER)) {
-			StringBuilder result = new StringBuilder();
+			return transformMarker(line, false);
-			String indent = getIndent(line);
+		}
-			this.project.getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
+		if (line.contains(MARKER_PLUGIN)) {
-				String name = repository.getName();
+			return transformMarker(line, true);
-				if (name.startsWith("spring-")) {
-					result.append(!result.isEmpty() ? "\n" : "");
-					result.append(mavenRepositoryXml(indent, repository));
-				}
-			});
-			return result.toString();
 		}
 		return line;
 	}
 
-	private String mavenRepositoryXml(String indent, MavenArtifactRepository repository) {
+	private String transformMarker(String line, boolean pluginRepository) {
+		StringBuilder result = new StringBuilder();
+		String indent = getIndent(line);
+		this.project.getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
+			String name = repository.getName();
+			if (name.startsWith("spring-")) {
+				result.append(!result.isEmpty() ? "\n" : "");
+				result.append(mavenRepositoryXml(indent, repository, pluginRepository));
+			}
+		});
+		return result.toString();
+	}
+
+	private String mavenRepositoryXml(String indent, MavenArtifactRepository repository, boolean pluginRepository) {
+		String rootTag = pluginRepository ? "pluginRepository" : "repository";
 		boolean snapshots = repository.getName().endsWith("-snapshot");
 		StringBuilder xml = new StringBuilder();
-		xml.append("%s<repository>%n".formatted(indent));
+		xml.append("%s<%s>%n".formatted(indent, rootTag));
 		xml.append("%s\t<id>%s</id>%n".formatted(indent, repository.getName()));
 		xml.append("%s\t<url>%s</url>%n".formatted(indent, repository.getUrl()));
 		xml.append("%s\t<releases>%n".formatted(indent));
@@ -91,7 +101,7 @@ public class RepoistoryTransformersExtension {
 		xml.append("%s\t<snapshots>%n".formatted(indent));
 		xml.append("%s\t\t<enabled>%s</enabled>%n".formatted(indent, snapshots));
 		xml.append("%s\t</snapshots>%n".formatted(indent));
-		xml.append("%s</repository>".formatted(indent));
+		xml.append("%s</%s>".formatted(indent, rootTag));
 		return xml.toString();
 	}
 
@@ -100,7 +110,7 @@ public class RepoistoryTransformersExtension {
 	}
 
 	static void apply(Project project) {
-		project.getExtensions().create("springRepoistoryTransformers", RepoistoryTransformersExtension.class, project);
+		project.getExtensions().create("springRepositoryTransformers", RepositoryTransformersExtension.class, project);
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

@@ -28,7 +28,7 @@ dependencies {
 task syncIntegrationTestSources(type: Sync) {
 	destinationDir file("${buildDir}/it")
 	from file("src/it")
-	filter(springRepoistoryTransformers.ant())
+	filter(springRepositoryTransformers.ant())
 }
 
 processResources {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@@ -94,7 +94,7 @@ ext {
 task copySettingsXml(type: Copy) {
 	from file("src/intTest/projects/settings.xml")
 	into "${buildDir}/generated-resources/settings"
-	filter(springRepoistoryTransformers.mavenSettings())
+	filter(springRepositoryTransformers.mavenSettings())
 }
 
 sourceSets {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/settings.xml

@@ -31,7 +31,7 @@
 						<enabled>true</enabled>
 					</snapshots>
 				</pluginRepository>
-				<!-- {spring.mavenRepositories} -->
+				<!-- {spring.mavenPluginRepositories} -->
 			</pluginRepositories>
 		</profile>
 	</profiles>

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle

@@ -50,7 +50,7 @@ task syncAntSources(type: Sync) {
 	destinationDir file("${buildDir}/ant")
 	from project.layout.projectDirectory
 	include "*.xml"
-	filter(springRepoistoryTransformers.ant())
+	filter(springRepositoryTransformers.ant())
 }
 
 task antRun(type: JavaExec) {