[jackson-jaxrs-providers] 139/162: Merge branch 'master' of https://github.com/FasterXML/jackson-jaxrs-providers

[Timo Aaltonen]

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

tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit 8661ca8903c7857d322184e62f1758ad5fe36618
Merge: a2b1980 0a4c7e7
Author: Tatu <tsaloranta at gmail.com>
Date:   Wed Apr 23 11:09:27 2014 -0700

    Merge branch 'master' of https://github.com/FasterXML/jackson-jaxrs-providers

 README.md                                          |  3 +-
 base/pom.xml                                       |  4 +-
 .../fasterxml/jackson/jaxrs/base/ProviderBase.java | 72 +++++++++++++++++-----
 .../fasterxml/jackson/jaxrs/cfg/JaxRSFeature.java  | 28 +++++++++
 cbor/pom.xml                                       |  4 +-
 json/pom.xml                                       |  4 +-
 .../jackson/jaxrs/json/TestCanDeserialize.java     | 44 +++++++++++--
 pom.xml                                            | 18 ++++--
 release-notes/VERSION                              | 14 +++--
 smile/pom.xml                                      |  4 +-
 .../jackson/jaxrs/smile/dw/ResourceTestBase.java   |  1 -
 .../jaxrs/smile/dw/SimpleEndpointTestBase.java     |  5 +-
 xml/pom.xml                                        |  4 +-
 .../jaxrs/xml/dw/SimpleEndpointTestBase.java       |  1 -
 14 files changed, 153 insertions(+), 53 deletions(-)

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