Explicitly use JBoss version of JAX-RS api

jbossws · Nov 20, 2017 · d21f581 · d21f581
1 parent 31fcd91
commit d21f581
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/modules/client/pom.xml b/modules/client/pom.xml
@@ -225,6 +225,11 @@
       <groupId>org.jboss.spec.javax.servlet</groupId>
       <artifactId>jboss-servlet-api_3.1_spec</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.spec.javax.ws.rs</groupId>
+      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+    </dependency>
 
     <!-- [JBWS-3722] Explicit JAXB dependencies to ensure the dependency management from jbossws-cxf pom.xml applies -->
     <dependency>
@@ -345,6 +350,7 @@
                         <exclude>org.apache.cxf:cxf-rt-bindings-corba</exclude>
                         <exclude>org.apache.cxf:cxf-rt-javascript</exclude>
                         <exclude>org.apache.geronimo.specs</exclude>
+                        <exclude>javax.ws.rs</exclude>
                         <exclude>org.codehaus.jra:jra</exclude>
                         <exclude>asm:asm</exclude> <!-- We want newer version -->
                         <exclude>org.slf4j:slf4j-jdk14</exclude>

diff --git a/modules/server/pom.xml b/modules/server/pom.xml
@@ -343,6 +343,7 @@
                         <exclude>org.apache.cxf:cxf-rt-bindings-corba</exclude>
                         <exclude>org.apache.cxf:cxf-rt-javascript</exclude>
                         <exclude>org.apache.geronimo.specs</exclude>
+                        <exclude>javax.ws.rs</exclude>
                         <exclude>org.codehaus.jra:jra</exclude>
                         <exclude>org.slf4j:slf4j-jdk14</exclude>
                         <exclude>org.springframework:*</exclude>

diff --git a/pom.xml b/pom.xml
@@ -92,6 +92,7 @@
     <jaxb.api.version>1.0.0.Alpha1</jaxb.api.version>
     <jaxb.impl.version>2.3.0</jaxb.impl.version>
     <jaxws.api.version>2.0.4.Final</jaxws.api.version>
+    <jaxrs.api.version>1.0.0.Final</jaxrs.api.version>
     <jsr181.api.version>1.0-MR1</jsr181.api.version>
     <commons-beanutils.version>1.9.2</commons-beanutils.version>
     <commons-collections.version>3.2.1</commons-collections.version>
@@ -416,6 +417,12 @@
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         <version>${cxf.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -966,6 +973,11 @@
         <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
         <version>${jaxws.api.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.spec.javax.ws.rs</groupId>
+        <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+        <version>${jaxrs.api.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.ejb</groupId>
         <artifactId>jboss-ejb-api_3.1_spec</artifactId>