From 0891398444a18def3c114ce0ce36d5b755d06247 Mon Sep 17 00:00:00 2001
From: lapentafd <francesco.lapenta@est.tech>
Date: Thu, 6 Feb 2025 11:16:54 +0000
Subject: [PATCH] Dependecy Update and S3 storage test fix

Issue-ID: CCSDK-4084
Change-Id: I1cab1db6ccb789cd958a782f2225eacfa16d0ee3
Signed-off-by: lapentafd <francesco.lapenta@est.tech>
---
 a1-policy-management/pom.xml                                 | 12 +++++++-----
 .../datastore/S3ObjectStoreTest.java                         |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index d5e40679..295c6d3e 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -47,7 +47,6 @@
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <swagger-annotations.version>2.2.15</swagger-annotations.version>
-        <spring-boot-actuator-autoconfigure.version>3.4.0</spring-boot-actuator-autoconfigure.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.16.1</commons-io.version>
@@ -58,8 +57,11 @@
         <surefire-report-plugin.version>3.0.0-M8</surefire-report-plugin.version>
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <software.amazon.awssdk.version>2.27.24</software.amazon.awssdk.version>
+        <software.amazon.awssdk.version>2.30.11</software.amazon.awssdk.version>
         <mapstruct.version>1.6.0</mapstruct.version>
+        <!-- Tracing Dependecies -->
+        <opentelemetry-bom.version>1.41.0</opentelemetry-bom.version>
+        <opentelemetry-instrumentation-bom-alpha.version>2.7.0-alpha</opentelemetry-instrumentation-bom-alpha.version>
         <allowskiptests>false</allowskiptests>
     </properties>
     <repositories>
@@ -294,7 +296,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
-            <version>3.3.0</version>
+            <version>${spring.boot.version}</version>
         </dependency>
     </dependencies>
     <dependencyManagement>
@@ -302,14 +304,14 @@
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-bom</artifactId>
-                <version>1.46.0</version>
+                <version>${opentelemetry-bom.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
                 <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-                <version>2.12.0-alpha</version>
+                <version>${opentelemetry-instrumentation-bom-alpha.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/datastore/S3ObjectStoreTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/datastore/S3ObjectStoreTest.java
index 941b7770..104abe04 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/datastore/S3ObjectStoreTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/datastore/S3ObjectStoreTest.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * ONAP : ccsdk oran
  * ======================================================================
- * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  * ======================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,10 +49,12 @@ class S3ObjectStoreTest {
     static ApplicationConfig appConfig;
     private static S3ObjectStore s3ObjectStore;
     private static final String bucketName = "s3bucket";
+    private static final String localstackVersion = "4.1.0";
 
+    @SuppressWarnings("resource") // @Testcontainers will manage the lifecycle of the container.
     @Container
     private static final LocalStackContainer localstack =
-            new LocalStackContainer(DockerImageName.parse("localstack/localstack:0.11.3"))
+            new LocalStackContainer(DockerImageName.parse("localstack/localstack:" + localstackVersion))
                     .withServices(LocalStackContainer.Service.S3);
 
     @BeforeAll
-- 
2.16.6