From e4f7e563732e894dd78201412dcb22d7314bb7d8 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Sat, 11 Aug 2018 00:17:59 -0400 Subject: 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) --- bpmn/MSOCommonBPMN/pom.xml | 2 -- bpmn/so-bpmn-building-blocks/pom.xml | 6 ------ bpmn/so-bpmn-infrastructure-common/pom.xml | 2 +- bpmn/so-bpmn-infrastructure-flows/pom.xml | 2 +- bpmn/so-bpmn-tasks/pom.xml | 6 ++++++ pom.xml | 5 +++-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index 005e7a3374..dfb6af793c 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -14,9 +14,7 @@ 7.8.0 - 4.5.5 - 2.0.1 1.1.1 1.8 1.8 diff --git a/bpmn/so-bpmn-building-blocks/pom.xml b/bpmn/so-bpmn-building-blocks/pom.xml index cc6e19d446..a8a6441740 100644 --- a/bpmn/so-bpmn-building-blocks/pom.xml +++ b/bpmn/so-bpmn-building-blocks/pom.xml @@ -9,7 +9,6 @@ so-bpmn-building-blocks jar - 2.0.1 3.1 1.2 1.4.196 @@ -141,11 +140,6 @@ commons-lang3 3.4 - - javax.ws.rs - javax.ws.rs-api - 2.0 - org.springframework spring-web diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml index 70b9d0633b..ab0ac25a99 100644 --- a/bpmn/so-bpmn-infrastructure-common/pom.xml +++ b/bpmn/so-bpmn-infrastructure-common/pom.xml @@ -234,7 +234,7 @@ javax.ws.rs javax.ws.rs-api - 2.0 + ${jax.ws.rs} org.onap.so diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml index 8557cf178e..1a3a64bcc8 100644 --- a/bpmn/so-bpmn-infrastructure-flows/pom.xml +++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml @@ -211,7 +211,7 @@ javax.ws.rs javax.ws.rs-api - 2.0 + ${jax.ws.rs} org.onap.so diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml index 68f7e5a3bb..3483aed8a7 100644 --- a/bpmn/so-bpmn-tasks/pom.xml +++ b/bpmn/so-bpmn-tasks/pom.xml @@ -30,6 +30,12 @@ org.onap.sdnc.northbound generic-resource-api-client 1.4.0-SNAPSHOT + + + javax.ws.rs + jsr311-api + + ch.vorburger.mariaDB4j diff --git a/pom.xml b/pom.xml index 32733b1ff3..beb42242b0 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,8 @@ content/repositories/snapshots/ content/repositories/public/ content/sites/site/org/onap/so/${project.version}/ - 3.1.12 + 3.2.5 + 2.1 @@ -547,7 +548,7 @@ javax.ws.rs javax.ws.rs-api - 2.0 + ${jax.ws.rs} javax.annotation -- cgit 1.2.3-korg