From aa14206e61fe230a65dbc8ca0b46d9155b5736ff Mon Sep 17 00:00:00 2001 From: lapentafd Date: Tue, 20 Aug 2024 14:24:11 +0100 Subject: Dependecy update in a1pms using spring parent 3.3.2 Issue-ID: CCSDK-4026 Change-Id: I8d53fd8a2918c154a390d44181e6a96bf476a6db Signed-off-by: lapentafd --- a1-policy-management/pom.xml | 38 ++++++++-------------- .../configuration/MetersTest.java | 4 +-- .../controllers/v2/ApplicationTest.java | 18 ++-------- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index 1455bad1..87cc8977 100644 --- a/a1-policy-management/pom.xml +++ b/a1-policy-management/pom.xml @@ -24,8 +24,8 @@ 4.0.0 org.onap.ccsdk.parent - spring-boot-31-starter-parent - 2.6.1 + spring-boot-33-starter-parent + 2.8.0-SNAPSHOT org.onap.ccsdk.oran @@ -36,18 +36,19 @@ 17 17 2.10.1 - 20231013 + 20240303 2.22.0 2.35.0 - 2.14.0 - 32.0.1-jre + 2.16.1 + 33.3.0-jre 2.0.2 0.30.0 3.0.0-M8 3.0.0-M8 0.8.8 ${project.version} - 2.20.12 + 2.27.8 + 1.6.0 false @@ -69,13 +70,7 @@ org.openapitools jackson-databind-nullable - 0.2.4 - - - - org.yaml - snakeyaml - 2.0 + 0.2.6 org.springframework.boot @@ -111,12 +106,6 @@ org.flywaydb flyway-core - - - javax.servlet - javax.servlet-api - 3.1.0 - org.aspectj aspectjweaver @@ -148,12 +137,12 @@ org.mapstruct mapstruct - 1.5.5.Final + ${mapstruct.version} org.mapstruct mapstruct-processor - 1.5.5.Final + ${mapstruct.version} @@ -231,7 +220,7 @@ com.github.erosb everit-json-schema - 1.14.0 + 1.14.4 @@ -254,7 +243,6 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 3.1.0 @@ -262,14 +250,14 @@ io.opentelemetry opentelemetry-bom - 1.38.0 + 1.41.0 pom import io.opentelemetry.instrumentation opentelemetry-instrumentation-bom-alpha - 2.4.0-alpha + 2.7.0-alpha pom import diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/MetersTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/MetersTest.java index 922d139d..c714268d 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/MetersTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/MetersTest.java @@ -22,8 +22,8 @@ package org.onap.ccsdk.oran.a1policymanagementservice.configuration; import static org.assertj.core.api.Assertions.assertThat; -import io.micrometer.prometheus.PrometheusConfig; -import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.micrometer.prometheusmetrics.PrometheusConfig; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; import java.time.Instant; import java.util.Arrays; diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java index 0519c2d5..be6d43f8 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java @@ -28,8 +28,6 @@ import static org.mockito.Mockito.doReturn; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; @@ -104,7 +102,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.test.context.TestPropertySource; import org.springframework.util.FileSystemUtils; -import org.springframework.web.reactive.function.client.WebClientRequestException; import org.springframework.web.reactive.function.client.WebClientResponseException; import reactor.core.publisher.Mono; @@ -163,8 +160,6 @@ class ApplicationTest { @Autowired OpenPolicyAgentSimulatorController openPolicyAgentSimulatorController; - private static Gson gson = new GsonBuilder().create(); - /** * Overrides the BeanFactory. */ @@ -235,7 +230,6 @@ class ApplicationTest { } @Test - @SuppressWarnings("squid:S2925") // "Thread.sleep" should not be used in tests. @DisplayName("test ZZ Actuator") void testZZActuator() throws Exception { // The test must be run last, hence the "ZZ" in the name. All succeeding tests @@ -251,15 +245,9 @@ class ApplicationTest { client.post("/actuator/loggers/org.springframework.boot.actuate", "{\"configuredLevel\":\"trace\"}").block(); // This will stop the web server and all coming tests will fail. - client.post("/actuator/shutdown", "").block(); - - Thread.sleep(1000); - - StepVerifier.create(restClient().get("/rics")) // Any call - .expectSubscription() // - .expectErrorMatches(t -> t instanceof WebClientRequestException) // - .verify(); - + ResponseEntity entity = client.postForEntity("/actuator/shutdown", "").block(); + assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(((String) entity.getBody())).contains("Shutting down"); } @Test -- cgit