Merge branch '3.4.x'

Closes gh-45563
This commit is contained in:
Andy Wilkinson
2025-05-15 08:28:17 +01:00

View File

@@ -20,7 +20,6 @@ import java.util.Collections;
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;
@@ -28,6 +27,7 @@ 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;