[jackson-datatype-joda] 02/05: Merge tag 'upstream/2.8.5'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jackson-datatype-joda.

commit d3cc86e85235fb76b26c3001acc87ffb12e6951d
Merge: c81c5bd c474883
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 10:41:43 2016 +0100

    Merge tag 'upstream/2.8.5'
    
    Upstream version 2.8.5

 pom.xml                                            |  25 +--
 release-notes/CREDITS                              |   5 +
 release-notes/VERSION                              |  24 ++-
 .../datatype/joda/cfg/JacksonJodaDateFormat.java   | 104 +++++++++++-
 .../datatype/joda/cfg/JacksonJodaFormatBase.java   |  20 ++-
 .../datatype/joda/cfg/JacksonJodaPeriodFormat.java |  25 ++-
 .../datatype/joda/deser/DateTimeDeserializer.java  |   2 +-
 .../joda/deser/DateTimeZoneDeserializer.java       |   2 +-
 .../datatype/joda/deser/DurationDeserializer.java  |  30 ++--
 .../datatype/joda/deser/InstantDeserializer.java   |  10 +-
 .../joda/deser/JodaDateDeserializerBase.java       |  50 +++---
 .../joda/deser/key/DurationKeyDeserializer.java    |   2 +-
 .../datatype/joda/ser/DateTimeSerializer.java      |   2 +-
 .../datatype/joda/ser/JodaDateSerializerBase.java  |  75 ++++-----
 .../datatype/joda/ser/PeriodSerializer.java        |   2 +-
 .../jackson/datatype/joda/DateTimeTest.java        |  37 ++++-
 .../joda/deser/DurationDeserializationTest.java    | 108 ++++++++++++
 .../joda/deser/MiscDeserializationTest.java        | 182 +++++++--------------
 .../joda/deser/PeriodDeserializationTest.java      |  79 +++++++++
 .../joda/{ => ser}/JodaSerializationTest.java      |   3 +-
 .../jackson/datatype/joda/ser/WriteZoneIdTest.java |  43 +++++
 21 files changed, 575 insertions(+), 255 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-datatype-joda.git