You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/08/15 15:42:03 UTC
[12/26] tomee git commit: TOMEE-2221 - Added Johnzon Jsonb Provider.
TOMEE-2221 - Added Johnzon Jsonb Provider.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/95cfcc21
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/95cfcc21
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/95cfcc21
Branch: refs/heads/master
Commit: 95cfcc21677651f500d55ee91a7b7404f112f0e2
Parents: bf92978
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Thu Aug 2 15:12:24 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Aug 10 17:59:14 2018 +0100
----------------------------------------------------------------------
server/openejb-cxf-rs/pom.xml | 3 ---
.../main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/95cfcc21/server/openejb-cxf-rs/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 5ab10d4..7d57407 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -119,14 +119,11 @@
<artifactId>johnzon-jaxrs</artifactId>
<version>${johnzon.version}</version>
</dependency>
- <!-- java 8 only, we can add it if we instantiate it after having checked java
- NOTE: needs jsonb-api too (available in jonzon groupId)
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
<version>${johnzon.version}</version>
</dependency>
- -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/95cfcc21/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
----------------------------------------------------------------------
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 31bd2e0..2d7a55f 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
@@ -224,6 +224,7 @@ public class CxfRSService extends RESTService {
final Collection<Object> defaults = new ArrayList<>();
for (final String provider : asList(
+ "org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider",
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider")) {
if (!isActive(provider)) {