Merge branch '3.0.x' into 3.1.x

Closes gh-38167

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java

@@ -100,7 +100,7 @@ void customNameIsReflectedInProperties() {
 	}
 
 	@Test
-	void nameCanBeExludedRemovedFromProperties() {
+	void nameCanBeExcludedFromProperties() {
 		BuildInfo task = createTask(createProject("test"));
 		task.getExcludes().add("name");
 		assertThat(buildInfoProperties(task)).doesNotContainKey("build.name");

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java

@@ -220,7 +220,7 @@ void runWhenHasActiveProfilesFromMultipleLocationsActivatesProfileFromOneLocatio
 	}
 
 	@Test
-	void runWhenHasActiveProfilesFromMultipleAdditionaLocationsWithOneSwitchedOffLoadsExpectedProperties() {
+	void runWhenHasActiveProfilesFromMultipleAdditionalLocationsWithOneSwitchedOffLoadsExpectedProperties() {
 		ConfigurableApplicationContext context = this.application.run(
 				"--spring.config.additional-location=classpath:enabletwoprofiles.properties,classpath:enableprofile.properties");
 		ConfigurableEnvironment environment = context.getEnvironment();
@@ -230,7 +230,7 @@ void runWhenHasActiveProfilesFromMultipleAdditionaLocationsWithOneSwitchedOffLoa
 	}
 
 	@Test
-	void runWhenHaslocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws Exception {
+	void runWhenHasLocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws Exception {
 		File localFile = new File(new File("."), "application.properties");
 		assertThat(localFile).doesNotExist();
 		try {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrarTests.java

@@ -214,7 +214,7 @@ void registerHintsWhenHasCrossReference() {
 	}
 
 	@Test
-	void pregisterHintsWhenHasUnresolvedGeneric() {
+	void registerHintsWhenHasUnresolvedGeneric() {
 		RuntimeHints runtimeHints = registerHints(WithGeneric.class);
 		assertThat(runtimeHints.reflection().typeHints()).hasSize(2)
 			.anySatisfy(javaBeanBinding(WithGeneric.class, "getGeneric"))

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java

@@ -185,7 +185,7 @@ void typeFromParentsDefaultClassAnnotatedSetterIsRegisteredForReflection() {
 	@Test
 	void componentTypesOfArraysAreRegisteredForReflection() {
 		ComponentModel component = new ComponentModel();
-		component.setClassName(ArrayParmeters.class.getName());
+		component.setClassName(ArrayParameters.class.getName());
 		TestGenerationContext generationContext = applyContribution(component);
 		assertThat(invokePublicConstructorsAndInspectAndInvokePublicMethodsOf(InetSocketAddress.class))
 			.accepts(generationContext.getRuntimeHints());
@@ -287,7 +287,7 @@ public interface Contract {
 
 	}
 
-	public static class ArrayParmeters {
+	public static class ArrayParameters {
 
 		public void addDestinations(InetSocketAddress... addresses) {