Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
c4f653e8
Commit
c4f653e8
authored
Nov 14, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Jackson 2.6.3
Closes gh-4170
parent
f6b59fb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
JacksonAutoConfiguration.java
.../boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+11
-1
pom.xml
spring-boot-dependencies/pom.xml
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View file @
c4f653e8
...
...
@@ -23,6 +23,7 @@ import java.util.Collection;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.TimeZone
;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
com.fasterxml.jackson.databind.Module
;
...
...
@@ -206,7 +207,16 @@ public class JacksonAutoConfiguration {
(
DateFormat
)
BeanUtils
.
instantiateClass
(
dateFormatClass
));
}
catch
(
ClassNotFoundException
ex
)
{
builder
.
dateFormat
(
new
SimpleDateFormat
(
dateFormat
));
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
dateFormat
);
// Since Jackson 2.6.3 we always need to set a TimeZone (see gh-4170)
// If none in our properties fallback to the Jackson's default
TimeZone
timeZone
=
this
.
jacksonProperties
.
getTimeZone
();
if
(
timeZone
==
null
)
{
timeZone
=
new
ObjectMapper
().
getSerializationConfig
()
.
getTimeZone
();
}
simpleDateFormat
.
setTimeZone
(
timeZone
);
builder
.
dateFormat
(
simpleDateFormat
);
}
}
}
...
...
spring-boot-dependencies/pom.xml
View file @
c4f653e8
...
...
@@ -86,7 +86,7 @@
<httpclient.version>
4.5.1
</httpclient.version>
<httpcore.version>
4.4.4
</httpcore.version>
<infinispan.version>
8.0.1.Final
</infinispan.version>
<jackson.version>
2.6.
1
</jackson.version>
<jackson.version>
2.6.
3
</jackson.version>
<janino.version>
2.7.8
</janino.version>
<javassist.version>
3.18.1-GA
</javassist.version>
<!-- Same as Hibernate -->
<javax-cache.version>
1.0.0
</javax-cache.version>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment