From 079b9bdf62bfcd07981f17b6d842cc5d9e9c4b32 Mon Sep 17 00:00:00 2001
From: "raviteja.karumuri" <raviteja.karumuri@est.tech>
Date: Mon, 11 Nov 2024 13:33:04 +0000
Subject: [PATCH] Update Pom.xml matches to the Onap Master

Issue-ID: NONRTRIC-1016
Change-Id: I3f65963e759221187775814001158b3d03683db0
Signed-off-by: Raviteja Karumuri <raviteja.karumuri@est.tech>
---
 pom.xml | 57 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 300dfa7..2a60bb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,15 @@
 * ========================LICENSE_END===================================
 -->
 <project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.3.2</version>
-        <relativePath />
+        <relativePath/>
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
     <artifactId>a1policymanagementservice</artifactId>
@@ -48,10 +48,10 @@
     </repositories>
     <properties>
         <java.version>17</java.version>
-        <software.amazon.awssdk.version>2.20.12</software.amazon.awssdk.version>
-        <json.version>20231013</json.version>
-        <commons-io.version>2.14.0</commons-io.version>
-        <guava.version>32.0.1-jre</guava.version>
+        <software.amazon.awssdk.version>2.27.8</software.amazon.awssdk.version>
+        <json.version>20240303</json.version>
+        <commons-io.version>2.16.1</commons-io.version>
+        <guava.version>33.3.0-jre</guava.version>
         <surefire-maven-plugin.version>3.0.0-M8</surefire-maven-plugin.version>
         <surefire-report-plugin.version>3.0.0-M8</surefire-report-plugin.version>
         <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
@@ -61,27 +61,41 @@
         <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
         <localstack.version>1.20.1</localstack.version>
         <junit.jupiter.version>1.20.1</junit.jupiter.version>
+        <gson.version>2.10.1</gson.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.3.2</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>
+        <springdoc.version>2.0.2</springdoc.version>
+        <docker-maven-plugin>0.30.0</docker-maven-plugin>
+        <ccsdk.project.version>${project.version}</ccsdk.project.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>
+            <version>${jackson-databind-nullable.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -244,9 +258,9 @@
         <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 -->
+        <!-- For Tracing -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-otel</artifactId>
@@ -267,6 +281,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <version>3.3.0</version>
         </dependency>
     </dependencies>
     <dependencyManagement>
@@ -274,14 +289,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>
@@ -298,7 +313,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-maven-plugin.version}</version>
                 <configuration>
-                    <skipTests>false</skipTests>
+                    <skipTests>${allowskiptests}</skipTests>
                 </configuration>
             </plugin>
             <plugin>
@@ -481,7 +496,7 @@
                     </execution>
                     <execution>
                         <id>generate-openapi-policy-api</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-sources	</phase>
                         <goals>
                             <goal>generate</goal>
                         </goals>
@@ -537,7 +552,7 @@
                             </configOptions>
                         </configuration>
                     </execution>
-                 </executions>
+                </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -582,7 +597,7 @@
                                         <include>api/pms-api/v3/index.html</include>
                                         <include>api/pms-api/v3/custom/index.html</include>
                                     </includes>
-                                    </resource>
+                                </resource>
                             </resources>
                         </configuration>
                     </execution>
@@ -744,4 +759,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>
\ No newline at end of file
-- 
2.16.6