Merge branch '2.0.x'

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