mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.0.x'
This commit is contained in:
commit
9bc6dbd8d8
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user