[jackson-jaxrs-providers] 127/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 b880246b369e430fbe38f654ebe9d1719a60e9d1
Merge: c67c774 94424b2
Author: Tatu <tsaloranta at gmail.com>
Date:   Fri Feb 28 14:18:58 2014 -0800

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

 README.md                                          |   2 +-
 base/pom.xml                                       |   9 +-
 .../fasterxml/jackson/jaxrs/base/ProviderBase.java | 237 ++++++++++++++++-----
 .../jackson/jaxrs/cfg/EndpointConfigBase.java      |  71 +++---
 .../fasterxml/jackson/jaxrs/cfg/JaxRSFeature.java  |   2 +-
 .../jackson/jaxrs/cfg/ObjectReaderInjector.java    |  45 ++++
 .../jackson/jaxrs/cfg/ObjectReaderModifier.java    |  29 +++
 .../jackson/jaxrs/cfg/ObjectWriterInjector.java    |  42 ++++
 .../jackson/jaxrs/cfg/ObjectWriterModifier.java    |  25 +++
 .../jackson/jaxrs/util/EndpointAsBeanProperty.java |   9 +-
 {json => cbor}/pom.xml                             |  25 ++-
 .../jackson/jaxrs/cbor/CBOREndpointConfig.java     |  50 +++++
 .../jackson/jaxrs/cbor/CBORMapperConfigurator.java | 114 ++++++++++
 .../jackson/jaxrs/cbor/CBORMediaTypes.java         |   9 +
 .../jackson/jaxrs/cbor/JacksonCBORProvider.java    |  47 ++--
 .../jaxrs/cbor/JacksonJaxbCBORProvider.java        |  64 ++++++
 .../jackson/jaxrs/cbor/PackageVersion.java.in      |  15 ++
 .../fasterxml/jackson/jaxrs/cbor/package-info.java |  21 ++
 .../services/javax.ws.rs.ext.MessageBodyReader     |   2 +
 .../services/javax.ws.rs.ext.MessageBodyWriter     |   1 +
 .../jackson/jaxrs/cbor}/JaxrsTestBase.java         |  26 ++-
 .../jackson/jaxrs/cbor/TestCBORVersions.java       |  28 +++
 .../jackson/jaxrs/cbor/TestCanDeserialize.java     |  25 +++
 .../jackson/jaxrs/cbor/dw/ResourceTestBase.java    |  93 ++++++++
 .../jaxrs/cbor/dw/SimpleEndpointTestBase.java      |  99 +++++++++
 .../jaxrs/cbor/jersey/SimpleEndpointTest.java      |  11 +
 json/pom.xml                                       |  19 +-
 .../jackson/jaxrs/json/JacksonJsonProvider.java    |  17 +-
 .../jackson/jaxrs/json/JsonEndpointConfig.java     |  10 +-
 .../jaxrs/json/JsonMappingExceptionMapper.java     |  13 +-
 .../jaxrs/json/JsonParseExceptionMapper.java       |  11 +-
 .../jaxrs/json/annotation/JacksonFeatures.java     |   2 +-
 .../jackson/jaxrs/json/JaxrsTestBase.java          |  36 +---
 .../fasterxml/jackson/jaxrs/json/TestJsonView.java |  17 +-
 .../jackson/jaxrs/json/dw/ResourceTestBase.java    | 122 +++++++++++
 .../jaxrs/json/dw/SimpleEndpointTestBase.java      | 168 +++++++++++++++
 .../jackson/jaxrs/json/dw/TestSimpleEndpoint.java  | 121 -----------
 .../jaxrs/json/dw/WriteModificationsTestBase.java  | 175 +++++++++++++++
 .../jaxrs/json/jersey/SimpleEndpointTest.java      |  11 +
 .../jaxrs/json/jersey/WriteModificationsTest.java  |  11 +
 .../json/resteasy/RestEasyProviderLoadingTest.java |  14 ++
 pom.xml                                            |  15 +-
 release-notes/VERSION                              |  29 ++-
 smile/pom.xml                                      |  19 +-
 .../jackson/jaxrs/smile/JacksonSmileProvider.java  |  17 +-
 .../jaxrs/smile/JsonMappingExceptionMapper.java    |  17 +-
 .../jaxrs/smile/JsonParseExceptionMapper.java      |  17 +-
 .../jackson/jaxrs/smile/SmileEndpointConfig.java   |  11 +-
 .../jaxrs/smile/annotation/JacksonFeatures.java    |   2 +-
 .../jackson/jaxrs/smile/JaxrsTestBase.java         |  23 ++
 .../jackson/jaxrs/smile/dw/ResourceTestBase.java   |  94 ++++++++
 .../jaxrs/smile/dw/SimpleEndpointTestBase.java     | 100 +++++++++
 .../jaxrs/smile/jersey/SimpleEndpointTest.java     |  11 +
 xml/pom.xml                                        |  22 +-
 .../jackson/jaxrs/xml/JacksonXMLProvider.java      |  11 +-
 .../jaxrs/xml/JsonMappingExceptionMapper.java      |  15 +-
 .../jaxrs/xml/JsonParseExceptionMapper.java        |  15 +-
 .../jackson/jaxrs/xml/XMLEndpointConfig.java       |  10 +-
 .../jaxrs/xml/annotation/JacksonFeatures.java      |   2 +-
 .../fasterxml/jackson/jaxrs/xml/JaxrsTestBase.java |  15 ++
 .../jaxrs/xml/TestJacksonFeaturesWithXML.java      |  11 +-
 .../fasterxml/jackson/jaxrs/xml/TestRootType.java  |  12 +-
 .../jackson/jaxrs/xml/dw/ResourceTestBase.java     |  93 ++++++++
 .../jaxrs/xml/dw/SimpleEndpointTestBase.java       | 108 ++++++++++
 .../jaxrs/xml/jersey/SimpleEndpointTest.java       |  11 +
 65 files changed, 2080 insertions(+), 448 deletions(-)

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