Skip to content

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

Make JSON-B auto-config back of if no JSON-P implementation is available 

Closes gh-14675
parent 8ee4c5e4
Show 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 @ ad647ba0
...@@ -34,7 +34,9 @@ import org.springframework.context.annotation.Configuration; ...@@ -34,7 +34,9 @@ import org.springframework.context.annotation.Configuration;
*/ */
@Configuration @Configuration
@ConditionalOnClass(Jsonb.class) @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 { public class JsonbAutoConfiguration {
@Bean @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