Adding JSON support (and moving to cxf 3.1.5-SNAPSHOT

jbossws · Nov 20, 2017 · 27759bd · 27759bd
1 parent 363988c
commit 27759bd
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/modules/rest-client/pom.xml b/modules/rest-client/pom.xml
@@ -51,6 +51,14 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-json-basic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
@@ -107,6 +115,10 @@
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>woodstox-core-asl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+    </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>

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
@@ -103,7 +103,7 @@ private void startDeploymentBus(final Deployment dep)
 
                JAXRSServerFactoryBean bean = ResourceUtils.createApplication(providerApp.getProvider(), false, false);
                bean.setBus(bus);
-               bean.setApplication(providerApp);
+               bean.setApplicationInfo(providerApp);
                bean.create();
             }
          } else {

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,11 @@
   <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>
@@ -117,6 +121,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>
+    <jettison.version>1.3.3</jettison.version>
     <modular.jdk.args />
     <modular.jdk.props />
   </properties>
@@ -413,6 +418,16 @@
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         <version>${cxf.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-json-basic</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-extension-providers</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
@@ -930,6 +945,17 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jettison</groupId>
+        <artifactId>jettison</artifactId>
+        <version>${jettison.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
 
       <dependency>
         <groupId>org.jboss.spec.javax.xml.soap</groupId>