Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source
This commit is contained in:
Phillip Webb
2022-11-09 11:32:24 -08:00
parent 7eb0fe4c89 0ef03d725f
commit 1adc7c7dd4
2 changed files with 1 additions and 1 deletions
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

@@ -185,7 +185,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);