From e3d2cc754448cb6b4e18133eaf730361160177ff Mon Sep 17 00:00:00 2001
From: lapentafd <francesco.lapenta@est.tech>
Date: Thu, 22 Aug 2024 11:32:09 +0100
Subject: [PATCH] Dependecy update in a1pms using spring parent 3.3.2 - London

Issue-ID: CCSDK-4026
Change-Id: I94cf0210a97a1fc2b604c452cc87380862ec7ded
Signed-off-by: lapentafd <francesco.lapenta@est.tech>
---
 a1-policy-management/pom.xml                               | 14 ++++----------
 .../configuration/MetersTest.java                          |  4 ++--
 .../controllers/v2/ApplicationTest.java                    | 13 +++----------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index d010a8c3..49f1e42b 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -25,8 +25,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-30-starter-parent</artifactId>
-        <version>2.5.5</version>
+        <artifactId>spring-boot-33-starter-parent</artifactId>
+        <version>2.8.0-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
@@ -37,13 +37,13 @@
         <java.version.source>17</java.version.source>
         <java.version.target>17</java.version.target>
         <gson.version>2.10.1</gson.version>
-        <json.version>20230227</json.version>
+        <json.version>20240303</json.version>
         <localstack.version>1.20.1</localstack.version>
         <junit.jupiter.version>1.20.1</junit.jupiter.version>
         <formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>2.35.0</spotless-maven-plugin.version>
         <commons-io.version>2.11.0</commons-io.version>
-        <guava.version>31.0.1-jre</guava.version>
+        <guava.version>33.3.0-jre</guava.version>
         <springdoc.version>2.0.2</springdoc.version>
         <docker-maven-plugin>0.30.0</docker-maven-plugin>
         <surefire-maven-plugin.version>3.0.0-M8</surefire-maven-plugin.version>
@@ -54,12 +54,6 @@
         <allowskiptests>false</allowskiptests>
     </properties>
     <dependencies>
-        <dependency>
-            <!-- Temporary until version 2 is included by the parent spring-boot-starter-parent  -->
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>2.0</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
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 1de3b2e9..b0255bf0 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
@@ -219,7 +219,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
@@ -235,15 +234,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<String> entity = client.postForEntity("/actuator/shutdown", "").block();
+        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(((String) entity.getBody())).contains("Shutting down");
     }
 
     @Test
-- 
2.16.6