Merge branch '3.2.x' into 3.3.x

Closes spring-projectsgh-41960

Author: snicoll

buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java

@@ -55,6 +55,7 @@
 import org.gradle.api.attributes.DocsType;
 import org.gradle.api.attributes.Usage;
 import org.gradle.api.component.AdhocComponentWithVariants;
+import org.gradle.api.component.ConfigurationVariantDetails;
 import org.gradle.api.component.SoftwareComponent;
 import org.gradle.api.file.CopySpec;
 import org.gradle.api.file.DirectoryProperty;
@@ -132,7 +133,7 @@ private void publishOptionalDependenciesInPom(Project project) {
 			if (component instanceof AdhocComponentWithVariants componentWithVariants) {
 				componentWithVariants.addVariantsFromConfiguration(
 						project.getConfigurations().getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME),
-						(variant) -> variant.mapToOptional());
+						ConfigurationVariantDetails::mapToOptional);
 			}
 		});
 		MavenPublication publication = (MavenPublication) project.getExtensions()

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@@ -227,7 +227,7 @@ private void applyConnectionDetails(FlywayConnectionDetails connectionDetails, D
 		 */
 		private void configureProperties(FluentConfiguration configuration, FlywayProperties properties) {
 			// NOTE: Using method references in the mapper methods can break
-			// back-compatibilty (see gh-38164)
+			// back-compatibility (see gh-38164)
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			String[] locations = new LocationResolver(configuration.getDataSource())
 				.resolveLocations(properties.getLocations())