Merge branch '3.3.x' into 3.4.x

Closes gh-45562

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java

@@ -20,14 +20,14 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import io.lettuce.core.dynamic.support.ResolvableType;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.health.NamedContributor;
 import org.springframework.boot.actuate.health.NamedContributors;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.ResolvableType;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;