[jackson-annotations] 03/06: Merge tag 'upstream/2.7.3'

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

commit 3d6eabdd48e7187420a418070910b012e56b6cb0
Merge: 5916ae3 33a92f4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 8 12:54:35 2016 +0200

    Merge tag 'upstream/2.7.3'
    
    Upstream version 2.7.3

 .travis.yml                                        |   6 +-
 README.md                                          |   8 +-
 pom.xml                                            |  13 +-
 release-notes/VERSION                              |  58 ++-
 .../jackson/annotation/JacksonAnnotationValue.java |  22 +
 .../jackson/annotation/JsonAutoDetect.java         |  25 +-
 ...yDescription.java => JsonClassDescription.java} |  16 +-
 .../fasterxml/jackson/annotation/JsonCreator.java  |  73 +++-
 .../fasterxml/jackson/annotation/JsonFormat.java   | 458 ++++++++++++++++++---
 .../jackson/annotation/JsonIgnoreProperties.java   |  32 ++
 .../fasterxml/jackson/annotation/JsonInclude.java  | 276 ++++++++++++-
 .../fasterxml/jackson/annotation/JsonProperty.java |  90 +++-
 .../annotation/JsonPropertyDescription.java        |   4 +-
 .../jackson/annotation/JsonPropertyOrder.java      |   4 +-
 .../fasterxml/jackson/annotation/JsonRootName.java |   4 -
 .../fasterxml/jackson/annotation/JsonTypeInfo.java |  37 +-
 .../fasterxml/jackson/annotation/JsonValue.java    |   2 +
 .../com/fasterxml/jackson/annotation/JsonView.java |   4 +-
 .../jackson/annotation/ObjectIdGenerator.java      |  46 ++-
 .../jackson/annotation/ObjectIdGenerators.java     |  82 +++-
 .../jackson/annotation/ObjectIdResolver.java       |  17 +-
 .../fasterxml/jackson/annotation/OptBoolean.java   |  54 +++
 .../jackson/annotation/SimpleObjectIdResolver.java |  25 +-
 .../fasterxml/jackson/annotation/FormatTest.java   |  90 ++++
 .../fasterxml/jackson/annotation/IncludeTest.java  |  86 ++++
 .../com/fasterxml/jackson/annotation/TestBase.java |   7 +
 26 files changed, 1362 insertions(+), 177 deletions(-)

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