From da41d8036d40a7d328f03804edb06cf27ff14ff3 Mon Sep 17 00:00:00 2001
From: "saul.gill" <saul.gill@est.tech>
Date: Fri, 6 Jun 2025 12:29:43 +0100
Subject: [PATCH] Update a1 pms dependencies

Update pom package versions
Update docker image
Small change in log exclusion funtionality
Mitigate vulnerabilities

Issue-ID: CCSDK-4113
Change-Id: I94603eee05acfc2390a9eed377c75c1f4c41bd1a
Signed-off-by: saul.gill <saul.gill@est.tech>
---
 a1-policy-management/Dockerfile                    |  2 +-
 a1-policy-management/pom.xml                       | 46 ++++++++++++----------
 .../util/v3/ReactiveEntryExitFilter.java           |  4 +-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/a1-policy-management/Dockerfile b/a1-policy-management/Dockerfile
index e266321d..34add99f 100644
--- a/a1-policy-management/Dockerfile
+++ b/a1-policy-management/Dockerfile
@@ -20,7 +20,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM amazoncorretto:17-alpine
+FROM nexus3.onap.org:10001/library/amazoncorretto:17-alpine
 
 #install vim editor
 RUN apk update
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index b83424a2..64888f6b 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-34-starter-parent</artifactId>
-        <version>3.1.1</version>
+        <artifactId>spring-boot-35-starter-parent</artifactId>
+        <version>3.1.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
@@ -36,34 +36,35 @@
     <properties>
         <java.version.source>17</java.version.source>
         <java.version.target>17</java.version.target>
-        <gson.version>2.11.0</gson.version>
-        <json.version>20240303</json.version>
-        <squareup.okhttp.version>5.0.0-alpha.14</squareup.okhttp.version>
+        <gson.version>2.13.1</gson.version>
+        <json.version>20250517</json.version>
+        <squareup.okhttp.version>5.0.0-alpha.16</squareup.okhttp.version>
         <kotlin.version>1.8.22</kotlin.version>
-        <localstack.version>1.20.1</localstack.version>
-        <junit.jupiter.version>1.20.1</junit.jupiter.version>
+        <localstack.version>1.21.1</localstack.version>
+        <junit.jupiter.version>1.21.1</junit.jupiter.version>
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
-        <everit-json-schema.version>1.14.5</everit-json-schema.version>
+        <everit-json-schema.version>1.14.6</everit-json-schema.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <validation-api.version>3.1.1</validation-api.version>
-        <swagger-annotations.version>2.2.29</swagger-annotations.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>
-        <guava.version>33.3.0-jre</guava.version>
+        <swagger-annotations.version>2.2.31</swagger-annotations.version>
+        <formatter-maven-plugin.version>2.26.0</formatter-maven-plugin.version>
+        <spotless-maven-plugin.version>2.44.5</spotless-maven-plugin.version>
+        <commons-io.version>2.19.0</commons-io.version>
+        <guava.version>33.4.8-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>
+        <docker-maven-plugin>0.46.0</docker-maven-plugin>
+        <surefire-maven-plugin.version>3.5.3</surefire-maven-plugin.version>
+        <surefire-report-plugin.version>3.5.3</surefire-report-plugin.version>
+        <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <software.amazon.awssdk.version>2.30.11</software.amazon.awssdk.version>
+        <software.amazon.awssdk.version>2.31.57</software.amazon.awssdk.version>
         <mapstruct.version>1.6.3</mapstruct.version>
         <!-- Tracing Dependecies -->
-        <opentelemetry-bom.version>1.41.0</opentelemetry-bom.version>
+        <opentelemetry-bom.version>1.49.0</opentelemetry-bom.version>
         <opentelemetry-instrumentation-bom-alpha.version>2.7.0-alpha</opentelemetry-instrumentation-bom-alpha.version>
         <allowskiptests>false</allowskiptests>
-        <version.logback>8.0</version.logback>
+        <version.logback>8.1</version.logback>
+        <version.kotlin>2.1.21</version.kotlin>
     </properties>
     <repositories>
         <repository>
@@ -304,6 +305,11 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>${version.logback}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${version.kotlin}</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/util/v3/ReactiveEntryExitFilter.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/util/v3/ReactiveEntryExitFilter.java
index a23e3aea..642c868a 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/util/v3/ReactiveEntryExitFilter.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/util/v3/ReactiveEntryExitFilter.java
@@ -56,8 +56,8 @@ public class ReactiveEntryExitFilter implements WebFilter {
 
     private final List<PathPattern> excludedPatterns = new ArrayList<>();
 
-    public ReactiveEntryExitFilter excludePathPatterns(PathPattern... patterns) {
-        excludedPatterns.addAll(Arrays.asList(patterns));
+    public ReactiveEntryExitFilter excludePathPatterns(PathPattern pattern) {
+        excludedPatterns.add(pattern);
         return this;
     }
 
-- 
2.16.6