Merge branch '3.3.x' into 3.4.x

Closes gh-44475

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java

@@ -109,7 +109,7 @@ public enum TestImage {
 	/**
 	 * A container image suitable for testing Elasticsearch 7.
 	 */
-	ELASTICSEARCH("docker.elastic.co/elasticsearch/elasticsearch", "7.17.5", () -> ElasticsearchContainer.class,
+	ELASTICSEARCH("docker.elastic.co/elasticsearch/elasticsearch", "7.17.28", () -> ElasticsearchContainer.class,
 			(container) -> ((ElasticsearchContainer) container).withEnv("ES_JAVA_OPTS", "-Xms32m -Xmx512m")
 				.withStartupAttempts(5)
 				.withStartupTimeout(Duration.ofMinutes(10))),