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

Merge branch '1.5.x' into 2.0.x

Browse Source
This commit is contained in:
Phillip Webb
2018-05-25 18:45:37 -07:00
parent 606eb9dda3 e69296d7d3
commit 21d80d87a3
94 changed files with 401 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,8 +237,9 @@ public class JerseyAutoConfiguration implements ServletContextAware {
final ObjectMapper objectMapper) {
addJaxbAnnotationIntrospectorIfPresent(objectMapper);
return (ResourceConfig config) -> {
config.register(JacksonFeature.class);
config.register(new ObjectMapperContextResolver(objectMapper),
JerseyAutoConfiguration.this.config.register(JacksonFeature.class);
JerseyAutoConfiguration.this.config.register(
new ObjectMapperContextResolver(objectMapper),
ContextResolver.class);
};
}