From 71dde3ec8992d76b996f70d53484df9b8d87b167 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 4 Mar 2015 17:52:01 +0000 Subject: [PATCH] Tolerate removal of JacksonJodaFormat in Jackson 2.5 We currently officially support Jackson 2.4, but some users wish to use Jackson 2.5. This causes a failure as JacksonAutoConfiguration depends on JacksonJodaFormat which exists in 2.4 but not in 2.5. This commit updates JodaDataTimeJacksonConfiguration to make it conditional on JacksonJodaFormat being on the classpath. This means that Jackson 2.5 users will not have configurable DateTime formatting (added in 201fb5e5) but things will generally work once again. Closes gh-2573 --- .../boot/autoconfigure/jackson/JacksonAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index c5ebc97dc1..eeb8d826a2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -106,7 +106,7 @@ public class JacksonAutoConfiguration { @Configuration @ConditionalOnClass({ Jackson2ObjectMapperBuilder.class, DateTime.class, - DateTimeSerializer.class }) + DateTimeSerializer.class, JacksonJodaFormat.class }) static class JodaDateTimeJacksonConfiguration { private final Log log = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class);