Add jackson provider and dependency

jbossws · Nov 20, 2017 · 22a0ec3 · 22a0ec3
1 parent 14318fb
commit 22a0ec3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
@@ -189,6 +189,10 @@
       <groupId>javax.jws</groupId>
       <artifactId>jsr181-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+    </dependency>
 
     <!-- jboss provided -->
     <dependency>

diff --git a/...ver/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JAXRSBusDeploymentAspect.java b/...ver/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JAXRSBusDeploymentAspect.java
@@ -29,6 +29,8 @@
 import javax.ws.rs.core.Application;
 import javax.xml.ws.spi.Provider;
 
+import  com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
@@ -181,7 +183,8 @@ private static void setJSONProviders(JAXRSServerFactoryBean bean) {
       JSONProvider jsonProvider = new JSONProvider();
       jsonProvider.setDropRootElement(true);
       bean.setProvider(jsonProvider);
-      //TODO: Add jackson provider
+      JacksonJsonProvider provider = new JacksonJsonProvider();
+      bean.setProvider(provider);
    }
 
    private static Object createSingletonInstance(Class<?> cls, Bus bus)

diff --git a/pom.xml b/pom.xml
@@ -32,11 +32,7 @@
   <description>JBossWS CXF stack</description>
 
 
-<<<<<<< 363988ca78700f38cd68c53919025ee9fc18f657
   <version>5.2.1-SNAPSHOT</version>
-=======
-  <version>5.1.3.rest-SNAPSHOT</version>
->>>>>>> Adding JSON support (and moving to cxf 3.1.5-SNAPSHOT
 
   <!-- Parent -->
   <parent>
@@ -121,6 +117,7 @@
     <jaspi.api.version>1.0.0.Alpha1</jaspi.api.version>
     <jacc.api.version>1.0.0.Final</jacc.api.version>
     <javax.inject.version>1</javax.inject.version>
+    <jackson.version>2.5.4</jackson.version>
     <jettison.version>1.3.3</jettison.version>
     <modular.jdk.args />
     <modular.jdk.props />
@@ -962,7 +959,11 @@
           </exclusion>
         </exclusions>
       </dependency>
-
+      <dependency>
+         <groupId>com.fasterxml.jackson.jaxrs</groupId>
+         <artifactId>jackson-jaxrs-json-provider</artifactId>
+         <version>${jackson.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.xml.soap</groupId>
         <artifactId>jboss-saaj-api_1.3_spec</artifactId>