Merge branch '3.3.x' into 3.4.x

Closes gh-43950

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -2485,17 +2485,17 @@ bom {
 			releaseNotes("https://github.com/mojohaus/versions/releases/tag/{version}")
 		}
 	}
-	library("WebJars Locator Lite", "1.0.1") {
+	library("WebJars Locator Core", "0.59") {
 		group("org.webjars") {
 			modules = [
-				"webjars-locator-lite"
+				"webjars-locator-core"
 			]
 		}
 	}
-	library("WebJars Locator Core", "0.59") {
+	library("WebJars Locator Lite", "1.0.1") {
 		group("org.webjars") {
 			modules = [
-				"webjars-locator-core"
+				"webjars-locator-lite"
 			]
 		}
 	}

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java

@@ -276,7 +276,7 @@ enum Type {
 	 */
 	record ComposeVersion(int major, int minor) {
 
-		public static final ComposeVersion UNKNOWN = new ComposeVersion(0, 0);
+		static final ComposeVersion UNKNOWN = new ComposeVersion(0, 0);
 
 		boolean isLessThan(int major, int minor) {
 			return major() < major || major() == major && minor() < minor;

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc

@@ -377,7 +377,7 @@ NOTE: Using a javadoc:org.springframework.boot.testcontainers.service.connection
 
 
 [[features.dev-services.testcontainers.at-development-time.importing-container-declarations]]
-==== Importing Testcontainer Declaration Classes
+==== Importing Testcontainers Declaration Classes
 
 A common pattern when using Testcontainers is to declare javadoc:org.testcontainers.containers.Container[] instances as static fields.
 Often these fields are defined directly on the test class.
@@ -402,7 +402,7 @@ You can also add javadoc:org.springframework.test.context.DynamicPropertySource[
 
 When using devtools, you can annotate beans and bean methods with javadoc:org.springframework.boot.devtools.restart.RestartScope[format=annotation].
 Such beans won't be recreated when the devtools restart the application.
-This is especially useful for Testcontainer javadoc:org.testcontainers.containers.Container[] beans, as they keep their state despite the application restart.
+This is especially useful for javadoc:org.testcontainers.containers.Container[] beans, as they keep their state despite the application restart.
 
 include-code::MyContainersConfiguration[]
 

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabase.java

@@ -77,7 +77,7 @@ enum Replace {
 		 * databases:
 		 * <ul>
 		 * <li>Any bean definition that includes {@link ContainerImageMetadata} (including
-		 * {@code @ServiceConnection} annotated Testcontainer databases, and connections
+		 * {@code @ServiceConnection} annotated Testcontainers databases, and connections
 		 * created using Docker Compose)</li>
 		 * <li>Any connection configured using a {@code spring.datasource.url} backed by a
 		 * {@link DynamicPropertySource @DynamicPropertySource}</li>

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

@@ -155,7 +155,7 @@ void jdkBuilderCanBeSpecifiedWithSpecificRedirects() {
 	}
 
 	@Test
-	void httpComponentsAreBuildConsideringSettingsInRestTemplateBuilder() {
+	void httpComponentsAreBuiltConsideringSettingsInRestTemplateBuilder() {
 		RestTemplateBuilder builder = new RestTemplateBuilder()
 			.requestFactoryBuilder(ClientHttpRequestFactoryBuilder.httpComponents());
 		assertThat(getRequestConfig((RestTemplateBuilder) null).isRedirectsEnabled()).isFalse();
@@ -209,9 +209,8 @@ private RequestConfig getRequestConfig(TestRestTemplate template) {
 		return factory.createRequestConfig();
 	}
 
-	private HttpClient getJdkHttpClient(TestRestTemplate templateWithRedirects) {
-		JdkClientHttpRequestFactory requestFactory = (JdkClientHttpRequestFactory) templateWithRedirects
-			.getRestTemplate()
+	private HttpClient getJdkHttpClient(TestRestTemplate template) {
+		JdkClientHttpRequestFactory requestFactory = (JdkClientHttpRequestFactory) template.getRestTemplate()
 			.getRequestFactory();
 		return (HttpClient) ReflectionTestUtils.getField(requestFactory, "httpClient");
 	}

…StartsConnectionOnceIntegrationTest.java …tartsConnectionOnceIntegrationTests.javaspring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTest.java renamed to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTest.java renamed to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java

@@ -39,7 +39,7 @@
  */
 @SpringJUnitConfig
 @Testcontainers(disabledWithoutDocker = true)
-class ServiceConnectionStartsConnectionOnceIntegrationTest {
+class ServiceConnectionStartsConnectionOnceIntegrationTests {
 
 	@Container
 	@ServiceConnection

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/context/ImportTestcontainers.java

@@ -30,7 +30,7 @@
 import org.springframework.context.annotation.Import;
 
 /**
- * Imports idiomatic Testcontainer declaration classes into the Spring
+ * Imports idiomatic Testcontainers declaration classes into the Spring
  * {@link ApplicationContext}. The following elements will be considered from the imported
  * classes:
  * <ul>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java

@@ -34,7 +34,7 @@ private ConnectionFactoryUnwrapper() {
 	}
 
 	/**
-	 * Return the native {@link ConnectionFactory} by unwrapping ot from a
+	 * Return the native {@link ConnectionFactory} by unwrapping from a
 	 * {@link CachingConnectionFactory}. Return the given {@link ConnectionFactory} if no
 	 * {@link CachingConnectionFactory} wrapper has been detected.
 	 * @param connectionFactory a connection factory

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperty.java

@@ -142,8 +142,7 @@ public String getEnvironmentVariableName() {
 	}
 
 	/**
-	 * Return the name of the application property name that can be used to set this
-	 * property.
+	 * Return the application property name that can be used to set this property.
 	 * @return the application property name
 	 * @since 3.4.0
 	 */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java

@@ -228,8 +228,8 @@ public void initialize(LoggingInitializationContext initializationContext, Strin
 
 	/**
 	 * Reset the stream used by the fallback listener to the current system out. This
-	 * allows the fallback lister to work with any captured output streams in a similar
-	 * way to the {@code follow} attribute of the {@code literal Console} appender.
+	 * allows the fallback listener to work with any captured output streams in a similar
+	 * way to the {@code follow} attribute of the {@code Console} appender.
 	 * @param statusLogger the status logger to update
 	 */
 	private void resetFallbackListenerStream(StatusLogger statusLogger) {