Skip to content

Commit 86f736b

Browse files
committed
Merge branch '3.4.x'
Closes gh-46002
2 parents ccdd79f + 22eec46 commit 86f736b

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@
5555
import org.springframework.boot.actuate.health.StatusAggregator;
5656
import org.springframework.boot.actuate.health.SystemHealth;
5757
import org.springframework.boot.autoconfigure.AutoConfigurations;
58-
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
5958
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
60-
import org.springframework.boot.logging.LogLevel;
6159
import org.springframework.boot.test.context.FilteredClassLoader;
6260
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
6361
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -371,7 +369,6 @@ void additionalJerseyHealthEndpointsPathsTolerateHealthEndpointThatIsNotWebExpos
371369
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class))
372370
.withClassLoader(
373371
new FilteredClassLoader(Thread.currentThread().getContextClassLoader(), DispatcherServlet.class))
374-
.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
375372
.withPropertyValues("management.endpoints.web.exposure.exclude=*",
376373
"management.endpoints.test.exposure.include=*")
377374
.run((context) -> {
@@ -523,9 +520,4 @@ public HealthEndpointGroups postProcessHealthEndpointGroups(HealthEndpointGroups
523520

524521
}
525522

526-
@Configuration(proxyBeanMethods = false)
527-
static class UnconditionalHealthEndpointWebExtensionConfiguration extends HealthEndpointWebExtensionConfiguration {
528-
529-
}
530-
531523
}

0 commit comments

Comments
 (0)