made required pom changes for cxf

cxf 3.2.5 also requires us to move to javax.ws.rs-api 2.1
javax.ws.rs-api 2.1 is fully backwards compatible with 2.0
it will not be a problem with our other dependencies

Issue-ID: SO-850
Change-Id: I2a6d9c5d6fb9025de8e5b4a00788275d7cc496a1
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 005e7a3..dfb6af7 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -14,9 +14,7 @@
 
        <properties>
                <camunda.version>7.8.0</camunda.version>
-
                <httpclient.version>4.5.5</httpclient.version>
-               <jax.ws.rs>2.0.1</jax.ws.rs>
                <jackson.version>1.1.1</jackson.version>
                <maven.compiler.target>1.8</maven.compiler.target>
                <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/bpmn/so-bpmn-building-blocks/pom.xml b/bpmn/so-bpmn-building-blocks/pom.xml
index cc6e19d..a8a6441 100644 (file)
--- a/bpmn/so-bpmn-building-blocks/pom.xml
+++ b/bpmn/so-bpmn-building-blocks/pom.xml
@@ -9,7 +9,6 @@
        <artifactId>so-bpmn-building-blocks</artifactId>
        <packaging>jar</packaging>
        <properties>
-               <jax.ws.rs>2.0.1</jax.ws.rs>
                <httpclient.version>3.1</httpclient.version>
                <camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
                <h2.version>1.4.196</h2.version>
@@ -141,11 +140,6 @@
                        <artifactId>commons-lang3</artifactId>
                        <version>3.4</version>
                </dependency>
-               <dependency>
-                       <groupId>javax.ws.rs</groupId>
-                       <artifactId>javax.ws.rs-api</artifactId>
-                       <version>2.0</version>
-               </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-web</artifactId>

diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index 70b9d06..ab0ac25 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -234,7 +234,7 @@
                <dependency>
                        <groupId>javax.ws.rs</groupId>
                        <artifactId>javax.ws.rs-api</artifactId>
-                       <version>2.0</version>
+                       <version>${jax.ws.rs}</version>
                </dependency>
                <dependency>
                <groupId>org.onap.so</groupId>

diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index 8557cf1..1a3a64b 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -211,7 +211,7 @@
                <dependency>
                        <groupId>javax.ws.rs</groupId>
                        <artifactId>javax.ws.rs-api</artifactId>
-                       <version>2.0</version>
+                       <version>${jax.ws.rs}</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>

diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index 68f7e5a..3483aed 100644 (file)
--- a/bpmn/so-bpmn-tasks/pom.xml
+++ b/bpmn/so-bpmn-tasks/pom.xml
@@ -30,6 +30,12 @@
                        <groupId>org.onap.sdnc.northbound</groupId>
                        <artifactId>generic-resource-api-client</artifactId>
                        <version>1.4.0-SNAPSHOT</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>javax.ws.rs</groupId>
+                                       <artifactId>jsr311-api</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>ch.vorburger.mariaDB4j</groupId>

diff --git a/pom.xml b/pom.xml
index 32733b1..beb4224 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,8 @@
                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
                <publicNexusPath>content/repositories/public/</publicNexusPath>
                <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-               <cxf.version>3.1.12</cxf.version>
+               <cxf.version>3.2.5</cxf.version>
+               <jax.ws.rs>2.1</jax.ws.rs>
        </properties>
        <distributionManagement>
                <repository>
@@ -547,7 +548,7 @@
                <dependency>
                        <groupId>javax.ws.rs</groupId>
                        <artifactId>javax.ws.rs-api</artifactId>
-                       <version>2.0</version>
+                       <version>${jax.ws.rs}</version>
                </dependency>
                <dependency>
                        <groupId>javax.annotation</groupId>