From d5968f56b382c50dfafc3b6feeccf5b81d176b9d Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Fri, 5 Feb 2021 20:34:11 -0500 Subject: update camunda and spring to latest versions Updated camunda to 7.14 and updated spring boot camunda to 3.4 Started to clean up duplicate maven dependencies Issue-ID: SO-3521 Signed-off-by: Benjamin, Max (mb388a) Change-Id: Ic65b04772b91dd989e41d6b6b93872978bc4e4e2 --- mso-api-handlers/mso-api-handler-common/pom.xml | 7 +- mso-api-handlers/mso-api-handler-infra/pom.xml | 106 +-------------------- .../onap/so/apihandlerinfra/ServiceInstances.java | 1 + .../onap/so/apihandlerinfra/ManualTasksTest.java | 4 +- .../so/apihandlerinfra/ServiceInstancesTest.java | 12 +-- .../mso-requests-db-repositories/pom.xml | 3 - .../org/onap/so/db/request/SiteStatusTest.java | 2 +- 7 files changed, 14 insertions(+), 121 deletions(-) (limited to 'mso-api-handlers') diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index 4e92775d02..01e148eedb 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -1,16 +1,12 @@ 4.0.0 - org.onap.so mso-api-handlers 1.7.1-SNAPSHOT - - mso-api-handler-common - mso-api-handler-common ONAP SO API Handler Common Libraries @@ -78,8 +74,7 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api org.json diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index b902564900..5b926adf5b 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -1,20 +1,16 @@ 4.0.0 - org.onap.so mso-api-handlers 1.7.1-SNAPSHOT - - mso-api-handler-infra - mso-api-handler-infra ONAP SO API Handler Infra - 7.10.0 + 7.14.0 1.2 UTF-8 UTF-8 @@ -56,32 +52,15 @@ javassist 3.25.0-GA - - org.springframework.boot - spring-boot-starter-web - - - io.swagger.core.v3 - swagger-annotations - ${swagger.version} - io.swagger.core.v3 swagger-jaxrs2 - 2.0.6 + 2.0.8 com.h2database h2 - - org.mariadb.jdbc - mariadb-java-client - - - org.springframework.boot - spring-boot-starter-actuator - org.springframework.boot spring-boot-starter-jersey @@ -96,58 +75,18 @@ - - org.springframework.retry - spring-retry - org.springframework.boot spring-boot-starter-webflux - - commons-lang - commons-lang - 2.6 - - - javax.activation - activation - 1.1.1 - - - javax.transaction - jta - 1.1 - - - org.json4s - json4s-jackson_2.12 - ${json4s-jackson-version} - - - org.json4s - json4s-core_2.12 - ${json4s-core-version} - javax.xml.ws jaxws-api - - javax.servlet - javax.servlet-api - javax.interceptor javax.interceptor-api - - - - org.onap.so - mso-requests-db - ${project.version} - org.onap.so mso-requests-db-repositories @@ -158,7 +97,6 @@ mso-catalog-db ${project.version} - pl.pragmatists JUnitParams @@ -181,11 +119,6 @@ - - com.github.java-json-tools - json-schema-core - 1.2.8 - com.github.java-json-tools json-schema-validator @@ -196,10 +129,6 @@ spring-boot-starter-test test - - com.h2database - h2 - org.springframework.boot spring-boot-configuration-processor @@ -208,14 +137,9 @@ ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.3.0 test - - com.googlecode.junit-toolbox - junit-toolbox - 2.4 - org.onap.so mso-api-handler-common @@ -227,18 +151,10 @@ 1.2.4.RELEASE test - - io.micrometer - micrometer-core - io.micrometer micrometer-registry-prometheus - - org.onap.aaf.authz - aaf-cadi-client - org.onap.aaf.authz aaf-cadi-aaf @@ -268,23 +184,7 @@ aaf-misc-rosetta runtime - - javax.xml.bind - jaxb-api - 2.3.0 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.0 - - ${project.artifactId}-${project.version} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java index 7924ca304a..9a4d0a45df 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java @@ -26,6 +26,7 @@ package org.onap.so.apihandlerinfra; import java.io.IOException; import java.util.HashMap; import java.util.Optional; +import java.util.stream.Collectors; import javax.transaction.Transactional; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java index f4ff19f53d..fb923faf78 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ManualTasksTest.java @@ -104,8 +104,8 @@ public class ManualTasksTest extends BaseTest { RequestError expectedResponse = new RequestError(); ServiceException se = new ServiceException(); se.setMessageId("SVC0002"); - se.setText("Mapping of request to JSON object failed: Unrecognized token \'test\': " - + "was expecting \'null\', \'true\', \'false\' or NaN\n at [Source: (String)\"test\"; line: 1, column: 9]"); + se.setText( + "Mapping of request to JSON object failed: Unrecognized token \u0027test\u0027: was expecting (JSON String, Number, Array, Object or token \u0027null\u0027, \u0027true\u0027 or \u0027false\u0027)\n at [Source: (String)\"test\"; line: 1, column: 5]"); expectedResponse.setServiceException(se); HttpHeaders headers = new HttpHeaders(); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java index d43bbb6ea0..b358f26cb2 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java @@ -2453,7 +2453,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals( - "Unable to check for duplicate instance due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error", + "Unable to check for duplicate instance due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error: [no body]", realResponse.getServiceException().getText()); } @@ -2498,7 +2498,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals( - "Unable to get process-instance history from Camunda for requestId: f0a35706-efc4-4e27-80ea-a995d7a2a40f due to error: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error", + "Unable to get process-instance history from Camunda for requestId: f0a35706-efc4-4e27-80ea-a995d7a2a40f due to error: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error: [no body]", realResponse.getServiceException().getText()); } @@ -2515,7 +2515,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals( - "Unable to check for duplicate instance due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error", + "Unable to check for duplicate instance due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error: [no body]", realResponse.getServiceException().getText()); } @@ -2547,7 +2547,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals( - "Unable to save instance to db due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error", + "Unable to save instance to db due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error: [no body]", realResponse.getServiceException().getText()); } @@ -2567,7 +2567,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals( - "Unable to save instance to db due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error", + "Unable to save instance to db due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error: [no body]", realResponse.getServiceException().getText()); } @@ -2584,7 +2584,7 @@ public class ServiceInstancesTest extends BaseTest { assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); RequestError realResponse = mapper.readValue(response.getBody(), RequestError.class); assertEquals( - "Unable to save instance to db due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error", + "Unable to save instance to db due to error contacting requestDb: org.springframework.web.client.HttpServerErrorException$InternalServerError: 500 Server Error: [no body]", realResponse.getServiceException().getText()); } diff --git a/mso-api-handlers/mso-requests-db-repositories/pom.xml b/mso-api-handlers/mso-requests-db-repositories/pom.xml index 8f623ad9e5..160ce9a7f8 100644 --- a/mso-api-handlers/mso-requests-db-repositories/pom.xml +++ b/mso-api-handlers/mso-requests-db-repositories/pom.xml @@ -1,15 +1,12 @@ 4.0.0 - org.onap.so mso-api-handlers 1.7.1-SNAPSHOT - mso-requests-db-repositories - mso-requests-db-repositories SO Request Database JPA Respositories diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java index 93218a2057..f5d08e942d 100644 --- a/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java +++ b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java @@ -60,7 +60,7 @@ public class SiteStatusTest { @Test public void sortByCreated() { - final PageRequest page1 = new PageRequest(0, 20, Direction.DESC, "created"); + final PageRequest page1 = PageRequest.of(0, 20, Direction.DESC, "created"); SiteStatus example = new SiteStatus(); example.setStatus(true); -- cgit 1.2.3-korg