root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9912 from eddumelendez:jackson_2.9.0 

* pr/9912:
  Upgrade to Jackson 2.9.0
This commit is contained in:
Stephane Nicoll 2017-07-31 09:39:44 +02:00
parent 9f75da9a8f 87ba8d2e14
commit f7c070938f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View File

@ -114,7 +114,7 @@ public class JacksonAutoConfiguration {
JacksonJodaDateFormat jacksonJodaFormat = getJacksonJodaDateFormat();
if (jacksonJodaFormat != null) {
module.addSerializer(DateTime.class,
new DateTimeSerializer(jacksonJodaFormat));
new DateTimeSerializer(jacksonJodaFormat, 0));
}
return module;
}

2
spring-boot-dependencies/pom.xml
View File

@ -94,7 +94,7 @@
<httpcore.version>4.4.6</httpcore.version>
<infinispan.version>9.1.0.Final</infinispan.version>
<influxdb-java.version>2.7</influxdb-java.version>
<jackson.version>2.9.0.pr4</jackson.version>
<jackson.version>2.9.0</jackson.version>
<janino.version>3.0.7</janino.version>
<javassist.version>3.21.0-GA</javassist.version> <!-- Same as Hibernate -->
<javax-cache.version>1.0.0</javax-cache.version>