[tomee] branch tomee-7.1.x updated: TOMEE-2565 - Fixes a regression with missing TomEEJsonbProvider in the lift of CXF providers

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
     new 424ea0f  TOMEE-2565 - Fixes a regression with missing TomEEJsonbProvider in the lift of CXF providers
     new 58dd347  Merge pull request #534 from rzo1/TOMEE-2565
424ea0f is described below

commit 424ea0f0121604b58f140bbf4d6233be5874591c
Author: Richard Zowalla <ri...@zowalla.com>
AuthorDate: Fri Aug 9 08:51:17 2019 +0200

    TOMEE-2565 - Fixes a regression with missing TomEEJsonbProvider in the lift of CXF providers
---
 .../src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 3f492ce..c455666 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -227,7 +227,7 @@ public class CxfRSService extends RESTService {
             String userConfiguredJsonProviders = SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders");
             if (userConfiguredJsonProviders == null) {
                 jsonProviders = asList(
-                        "org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
+                        "org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonbProvider",
                         "org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider");
             } else {
                 jsonProviders = asList(userConfiguredJsonProviders.split(","));