From 05b965436624e2f44873bc11e8ab534220c68e2a Mon Sep 17 00:00:00 2001
From: lapentafd <francesco.lapenta@est.tech>
Date: Thu, 29 Aug 2024 12:45:10 +0100
Subject: Update newdelhi branch HEAD

Select&squash recent updates & fixes from master branch, adapted for new-delhi branch. Including:

https://gerrit.onap.org/r/c/ccsdk/oran/+/138693
Set serviceId in v2 policy_info to optional and blank by default - master

https://gerrit.onap.org/r/c/ccsdk/oran/+/138734
new onap logo

https://gerrit.onap.org/r/c/ccsdk/oran/+/138762
Improving code-coverage for the Handle non transient policy deletion bug fix - master

https://gerrit.onap.org/r/c/ccsdk/oran/+/138788
Enable springboot test for AsyncRestClientTest

https://gerrit.onap.org/r/c/ccsdk/oran/+/138787
Re-arrange application properties
*PARTIAL

https://gerrit.onap.org/r/c/ccsdk/oran/+/138772
Improve tests/issues found in Sonar report - A1 Oslo-Part2

https://gerrit.onap.org/r/c/ccsdk/oran/+/138827
Dependecy update in a1pms using spring parent 3.3.2

https://gerrit.onap.org/r/c/ccsdk/oran/+/138862
Improve tests/issues found in Sonar report - A1 Oslo/NewDelhi/Montreal/London-Part3-master

Issue-ID: CCSDK-3968
Change-Id: I40f7585e9416f03c8bec2b00d57dadb05bc624ca
Signed-off-by: lapentafd <francesco.lapenta@est.tech>
---
 a1-policy-management/pom.xml | 64 +++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

(limited to 'a1-policy-management/pom.xml')

diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 2c13d392..a84aa1f9 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -24,8 +24,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-31-starter-parent</artifactId>
-        <version>2.6.1</version>
+        <artifactId>spring-boot-33-starter-parent</artifactId>
+        <version>2.8.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
@@ -36,46 +36,49 @@
         <java.version.source>17</java.version.source>
         <java.version.target>17</java.version.target>
         <gson.version>2.10.1</gson.version>
-        <json.version>20231013</json.version>
+        <json.version>20240303</json.version>
+        <localstack.version>1.20.1</localstack.version>
+        <junit.jupiter.version>1.20.1</junit.jupiter.version>
+        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
+        <everit-json-schema.version>1.14.4</everit-json-schema.version>
+        <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.1.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.14.0</commons-io.version>
-        <guava.version>32.0.1-jre</guava.version>
+        <commons-io.version>2.16.1</commons-io.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>
         <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.20.12</software.amazon.awssdk.version>
+        <software.amazon.awssdk.version>2.27.8</software.amazon.awssdk.version>
+        <mapstruct.version>1.6.0</mapstruct.version>
         <allowskiptests>false</allowskiptests>
     </properties>
     <dependencies>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <version>${validation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <version>${javax.annotation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>2.2.15</version>
+            <version>${swagger-annotations.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.4</version>
-        </dependency>
-        <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>
+            <version>${jackson-databind-nullable.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -93,12 +96,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
-        <dependency>
-            <!-- May be possible to remove this later when ccsdk parent bom stabilizes -->
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
@@ -130,12 +127,12 @@
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
-            <version>1.5.5.Final</version>
+            <version>${mapstruct.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-processor</artifactId>
-            <version>1.5.5.Final</version>
+            <version>${mapstruct.version}</version>
         </dependency>
         <!-- Actuator dependencies -->
         <dependency>
@@ -169,6 +166,18 @@
             <optional>true</optional>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>localstack</artifactId>
+            <version>${localstack.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -213,7 +222,7 @@
         <dependency>
             <groupId>com.github.erosb</groupId>
             <artifactId>everit-json-schema</artifactId>
-            <version>1.14.0</version>
+            <version>${everit-json-schema.version}</version>
         </dependency>
         <!-- For Tracing -->
         <dependency>
@@ -236,7 +245,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
-            <version>3.1.0</version>
         </dependency>
     </dependencies>
     <dependencyManagement>
@@ -244,14 +252,14 @@
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-bom</artifactId>
-                <version>1.38.0</version>
+                <version>1.41.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
                 <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-                <version>2.4.0-alpha</version>
+                <version>2.7.0-alpha</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-- 
cgit