Merge branch '4.0.x'

Closes gh-48700
This commit is contained in:
Andy Wilkinson
2026-01-08 12:01:09 +00:00
45 changed files with 95 additions and 123 deletions
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.webmvc.actuate.autoconfigure.health;
package org.springframework.boot.webmvc.autoconfigure.actuate.endpoint.web;
import org.junit.jupiter.api.Test;
@@ -32,7 +32,6 @@ import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.contributor.HealthIndicator;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.webmvc.actuate.endpoint.web.AdditionalHealthEndpointPathsWebMvcHandlerMapping;
import org.springframework.boot.webmvc.autoconfigure.actuate.endpoint.web.WebMvcHealthEndpointExtensionAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.DispatcherServlet;