root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

This commit is contained in:
Phillip Webb 2022-11-09 11:31:55 -08:00
parent b1494d4a39 a431ae04e6
commit 0ef03d725f
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebfluxHealthEndpointAdditionalPathIntegrationTests.java → spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxHealthEndpointAdditionalPathIntegrationTests.java
View File

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View File

@ -186,7 +186,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
static class JacksonResourceConfigCustomizer {
@Bean
ResourceConfigCustomizer resourceConfigCustomizer(final ObjectMapper objectMapper) {
ResourceConfigCustomizer jacksonResourceConfigCustomizer(ObjectMapper objectMapper) {
return (ResourceConfig config) -> {
config.register(JacksonFeature.class);
config.register(new ObjectMapperContextResolver(objectMapper), ContextResolver.class);