[jackson-module-jaxb-annotations] 06/08: Merge branch 'upstream'

[Timo Aaltonen]

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 3056c60150648300e12059109207c4561a87bfe5
Merge: adf5573 56ca1a0
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Sep 9 00:09:51 2014 +0300

    Merge branch 'upstream'

 pom.xml                                            |  6 +-
 release-notes/VERSION                              |  8 +-
 .../module/jaxb/JaxbAnnotationIntrospector.java    | 58 +++++++++++++--
 .../module/jaxb/{failing => id}/TestXmlID.java     |  2 +-
 .../module/jaxb/{test => introspect}/Content.java  | 85 +++++++++++-----------
 .../jaxb/{test => introspect}/TestAccessType.java  |  8 +-
 .../{test => introspect}/TestJaxbAutoDetect.java   |  2 +-
 .../{test => introspect}/TestJaxbFieldAccess.java  |  2 +-
 .../module/jaxb/introspect/TestPropertyNaming.java | 52 +++++++++++++
 .../{test => introspect}/TestPropertyOrdering.java |  8 +-
 .../TestPropertyVisibility.java                    | 14 +---
 .../{test => misc}/TestDeserializerCaching.java    |  2 +-
 .../TestDomElementSerialization.java               |  2 +-
 .../jaxb/{test => misc}/TestElementWrapper.java    |  2 +-
 .../{test => misc}/TestJaxbNullProperties.java     |  2 +-
 .../module/jaxb/{test => misc}/TestRootName.java   |  2 +-
 .../jaxb/{test => misc}/TestSchemaGeneration.java  |  8 +-
 .../TestXmlAnyElementWithElementRef.java           |  2 +-
 .../module/jaxb/{test => misc}/package-info.java   |  2 +-
 .../jackson/module/jaxb/test/CommonAttributes.java | 53 --------------
 .../jaxb/{test => types}/TestCyclicTypes.java      |  2 +-
 .../jaxb/{test => types}/TestJaxbPolymorphic.java  |  2 +-
 .../{test => types}/TestJaxbPolymorphicLists.java  | 13 ++--
 .../{test => types}/TestJaxbPolymorphicMaps.java   | 13 ++--
 .../jaxb/{test => types}/TestJaxbTypeCoercion.java |  2 +-
 .../module/jaxb/{test => types}/TestJaxbTypes.java |  2 +-
 26 files changed, 183 insertions(+), 171 deletions(-)

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