Skip to content

S
spring-boot
Commit 9bc6dbd8 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.0.x'

parents 2d3bd623 ad647ba0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java
View file @ 9bc6dbd8
......@@ -34,7 +34,9 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
@ConditionalOnClass(Jsonb.class)
@ConditionalOnResource(resources = "classpath:META-INF/services/javax.json.bind.spi.JsonbProvider")
@ConditionalOnResource(resources = {
"classpath:META-INF/services/javax.json.bind.spi.JsonbProvider",
"classpath:META-INF/services/javax.json.spi.JsonProvider" })
public class JsonbAutoConfiguration {
@Bean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment