[jackson-dataformat-xml] 02/02: Merge branch 'master' of git://anonscm.debian.org/pkg-java/jackson-dataformat-xml

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jackson-dataformat-xml.

commit f35f97107083018e7b7b1649e56113b69d2e0e7b
Merge: e02cc04 a94ebde
Author: Markus Koschany <apo at debian.org>
Date:   Sat May 7 23:42:36 2016 +0200

    Merge branch 'master' of git://anonscm.debian.org/pkg-java/jackson-dataformat-xml

 .gitattributes                                     |   3 +
 README.md                                          |   2 +-
 debian/changelog                                   |   8 ++
 pom.xml                                            |   6 +-
 release-notes/VERSION                              |  20 ++-
 .../jackson/dataformat/xml/XmlFactory.java         |   2 +
 .../dataformat/xml/deser/FromXmlParser.java        | 135 +++++++++++----------
 .../dataformat/xml/deser/XmlTokenStream.java       |   2 +-
 .../xml/failing/PolymorphicList97Test.java         |  64 ++++++++++
 .../xml/failing/TestDeserialization.java           |   2 +-
 .../xml/failing/TestUntypedListSerialization.java  |   2 +-
 .../DeserializePolyList178Test.java                |  10 +-
 .../dataformat/xml/lists/ListDeser191Test.java     |  40 ++++++
 13 files changed, 219 insertions(+), 77 deletions(-)

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