From ad647ba07334f9d4d1cd5aadd36485826feba48d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 5 Oct 2018 13:05:14 +0100 Subject: [PATCH] Make JSON-B auto-config back of if no JSON-P implementation is available Closes gh-14675 --- .../boot/autoconfigure/jsonb/JsonbAutoConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java index cab6221e36..0f3c08c469 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfiguration.java @@ -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