[jackson-databind] 02/03: Merge tag 'upstream/2.7.4'

[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-databind.

commit fe2f6ac86b0ffdeea65bed82e2b7b5f4e01b46a2
Merge: 9ac397a 95b820d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 13 10:08:31 2016 +0200

    Merge tag 'upstream/2.7.4'
    
    Upstream version 2.7.4

 pom.xml                                            |   6 +-
 release-notes/CREDITS                              |   9 ++
 release-notes/VERSION                              |  21 +++-
 .../jackson/databind/AnnotationIntrospector.java   |  18 +++-
 .../jackson/databind/DeserializationContext.java   | 111 +++++++++++++++++++--
 .../jackson/databind/JsonMappingException.java     |  89 ++++++++++++-----
 .../fasterxml/jackson/databind/ObjectMapper.java   |  24 ++++-
 .../fasterxml/jackson/databind/ObjectReader.java   |  43 ++++----
 .../jackson/databind/cfg/ContextAttributes.java    |   6 +-
 .../databind/deser/BasicDeserializerFactory.java   |  14 +--
 .../databind/deser/impl/ExternalTypeHandler.java   |  17 ++--
 .../deser/std/AtomicReferenceDeserializer.java     |  24 +++--
 .../databind/deser/std/DateDeserializers.java      |   4 +-
 .../deser/std/StdDelegatingDeserializer.java       |  21 ++--
 .../databind/deser/std/StdDeserializer.java        |  30 +++---
 .../introspect/JacksonAnnotationIntrospector.java  |  86 ++++++++++++----
 .../databind/jsontype/TypeDeserializer.java        |  31 +++---
 .../jsontype/impl/ClassNameIdResolver.java         |  20 ++--
 .../databind/jsontype/impl/TypeNameIdResolver.java |  28 +++---
 .../module/SimpleAbstractTypeResolver.java         |  13 ++-
 .../fasterxml/jackson/databind/node/POJONode.java  |   3 +-
 .../databind/ser/BeanSerializerFactory.java        |   8 +-
 .../ser/std/AtomicReferenceSerializer.java         |  32 ++++--
 .../databind/ser/std/JsonValueSerializer.java      |   6 ++
 .../jackson/databind/ser/std/StdSerializer.java    |  57 ++++++++---
 .../jackson/databind/type/ReferenceType.java       |   5 +-
 .../jackson/databind/type/TypeFactory.java         |  24 ++++-
 .../fasterxml/jackson/databind/util/Converter.java |   5 +-
 .../jackson/databind/util/ISO8601Utils.java        |   4 +-
 .../fasterxml/jackson/databind/BaseMapTest.java    |  41 ++++++++
 .../jackson/databind/TestJDKSerialization.java     |   1 -
 .../databind/convert/TestConvertingSerializer.java |   6 --
 .../databind/creators/CreatorPropertiesTest.java   |  32 ++++++
 .../databind/deser/TestAnnotationUsing.java        |   1 -
 .../jackson/databind/deser/TestJDKAtomicTypes.java |  54 ++++++++++
 .../interop/ExceptionSerializableTest1195.java     |  82 +++++++++++++++
 .../jsontype/AbstracTypeMapping1186Test.java       |  47 +++++++++
 .../databind/jsontype/ExternalTypeId198Test.java   |  70 +++++++++++++
 .../jsontype/PolymorphicViaRefTypeTest.java        |  75 ++++++++++++++
 .../databind/jsontype/TestAbstractContainers.java  |   2 +-
 .../jackson/databind/jsontype/TestExternalId.java  |  87 ++++++----------
 .../databind/jsontype/TypeResolverTest.java        |  56 +++++++++++
 .../jackson/databind/node/TestConversions.java     |  30 +++---
 .../jackson/databind/seq/ObjectReaderTest.java     |   3 +-
 .../ser/{TestAnyGetter.java => AnyGetterTest.java} |  48 ++++++++-
 .../jackson/databind/ser/TestJsonSerialize2.java   |   6 +-
 .../jackson/databind/ser/TestJsonSerializeAs.java  |  39 +++++++-
 .../databind/ser/TestSimpleAtomicTypes.java        |  40 ++++++--
 .../jackson/databind/type/TestJavaType.java        |  45 +++++++--
 .../jackson/failing/AnyGetter1124Test.java         |  55 ----------
 .../jackson/failing/CreatorProperties1122Test.java |  48 ---------
 .../jackson/failing/ExternalId96Test.java          |  62 ++++++++++++
 .../failing/TestConvertingSerializer357.java       |  38 +++++++
 53 files changed, 1307 insertions(+), 420 deletions(-)

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