Merge branch 'allow-custom-json-provider' of github.com:exabrial/tomee into tomee-7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1b73ff86 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1b73ff86 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1b73ff86 Branch: refs/heads/tomee-7.0.x Commit: 1b73ff86c8594ccc7967d886f0961a85922b2aa2 Parents: 1dea4fb 0d16fc8 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Tue Oct 16 22:22:45 2018 +0100 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Tue Oct 16 22:22:45 2018 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/server/cxf/rs/CxfRSService.java | 13 ++++++++++--- .../openejb/server/cxf/rs/CxfRsHttpListener.java | 6 ++++-- .../java/org/apache/tomee/installer/Installer.java | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) ----------------------------------------------------------------------