This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository jackson-module-jaxb-annotations.
commit de46802db456d41277686f8d4ae1b720816d593c Merge: 05ec7b2 7df1f26 Author: Timo Aaltonen <[email protected]> Date: Thu Aug 14 23:49:44 2014 +0300 Merge branch 'upstream' README.md | 2 +- pom.xml | 33 ++-- release-notes/CREDITS | 8 + release-notes/VERSION | 24 ++- .../module/jaxb/JaxbAnnotationIntrospector.java | 201 ++++++++++++--------- .../module/jaxb/ser/DataHandlerJsonSerializer.java | 26 ++- .../module/jaxb/ser/DomElementJsonSerializer.java | 27 +-- src/main/resources/META-INF/LICENSE | 8 + src/main/resources/META-INF/NOTICE | 20 ++ .../module/jaxb/test/TestElementWrapper.java | 61 +++++++ .../jackson/module/jaxb/test/TestJaxbTypes.java | 7 +- .../jackson/module/jaxb/test/TestWrapperName.java | 40 ---- 12 files changed, 291 insertions(+), 166 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-module-jaxb-annotations.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
