[jackson-dataformat-yaml] 03/07: 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-dataformat-yaml.

commit f49614564d47564e32e45e5ad4b20555e209d162
Merge: 3f112c9 329d9a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 12:11:02 2016 +0100

    Merge tag 'upstream/2.8.5'
    
    Upstream version 2.8.5

 .gitattributes                                     |   3 +
 README.md                                          |   4 +-
 pom.xml                                            |  60 +--
 release-notes/CREDITS                              |  21 ++
 release-notes/VERSION                              |  51 +++
 .../dataformat/yaml/JacksonYAMLParseException.java |  16 +
 .../jackson/dataformat/yaml/UTF8Reader.java        |  28 +-
 .../jackson/dataformat/yaml/UTF8Writer.java        |  29 +-
 .../jackson/dataformat/yaml/YAMLFactory.java       |   2 +-
 .../jackson/dataformat/yaml/YAMLGenerator.java     | 115 +++---
 .../jackson/dataformat/yaml/YAMLParser.java        |  60 +--
 .../dataformat/yaml/snakeyaml/error/Mark.java      |  46 +++
 .../yaml/snakeyaml/error/MarkedYAMLException.java  |  45 +++
 .../yaml/snakeyaml/error/YAMLException.java        |  27 ++
 .../yaml/snakeyaml/error/package-info.java         |  11 +
 .../dataformat/yaml/ExceptionConversionTest.java   |   8 +-
 .../dataformat/yaml/SimpleGenerationTest.java      | 118 +++++-
 .../jackson/dataformat/yaml/SimpleParseTest.java   | 401 +++++++++++----------
 .../jackson/dataformat/yaml/TestVersions.java      |  20 +
 .../jackson/dataformat/yaml/UTF8ReaderTest.java    |  37 ++
 .../jackson/dataformat/yaml/failsafe/OSGiIT.java   |  10 +-
 21 files changed, 761 insertions(+), 351 deletions(-)

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