From: saul.gill <saul.gill@est.tech>
Date: Tue, 8 Apr 2025 07:39:29 +0000 (+0100)
Subject: Dependency updates
X-Git-Tag: 2.1.0~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7cf99451c8827b245e3944430b3a0259f9a5c0d0;p=ccsdk%2Foran.git

Dependency updates

Issue-ID: CCSDK-4113
Change-Id: If24d0d449464a0ad38a0c54281306c0dbc9182f1
Signed-off-by: saul.gill <saul.gill@est.tech>
---

diff --git a/a1-policy-management/Dockerfile b/a1-policy-management/Dockerfile
index 7a20fed9..57bb9c14 100644
--- a/a1-policy-management/Dockerfile
+++ b/a1-policy-management/Dockerfile
@@ -3,6 +3,7 @@
 # ONAP : ccsdk oran
 # ================================================================================
 # Copyright (C) 2019-2020 Nordix Foundation. All rights reserved.
+# Modifications Copyright (C) 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.
@@ -19,14 +20,14 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM openjdk:24-slim
+FROM amazoncorretto:17-alpine3.17-jdk
 
 #install vim editor
-RUN apt-get update
-RUN apt-get install -y vim
+RUN apk update
+RUN apk add vim
 
 #install curl
-RUN apt-get install -y curl
+RUN apk add curl
 
 EXPOSE 8081 8433
 
@@ -40,7 +41,7 @@ RUN chmod -R 777 /var/policy-management-service
 
 
 
-RUN groupadd -r onap && useradd -ms /bin/bash a1pms -g onap
+RUN addgroup -S onap && adduser --shell /bin/bash --gecos "" --ingroup onap --disabled-password a1pms
 RUN chown -R a1pms:onap /var/log/policy-agent
 
 ADD /config/application.yaml /opt/app/policy-agent/config/application.yaml
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 1d50baf8..3e7c2c4c 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -42,11 +42,11 @@
         <kotlin.version>1.8.22</kotlin.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>
+        <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
+        <everit-json-schema.version>1.14.5</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>
+        <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>
@@ -58,7 +58,7 @@
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <software.amazon.awssdk.version>2.30.11</software.amazon.awssdk.version>
-        <mapstruct.version>1.6.0</mapstruct.version>
+        <mapstruct.version>1.6.3</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>
@@ -93,14 +93,14 @@
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <version>${validation-api.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation-api.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.annotation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -612,6 +612,7 @@
                                 <unhandledException>true</unhandledException>
                                 <openApiNullable>false</openApiNullable>
                                 <skipDefaultInterface>true</skipDefaultInterface>
+                                <useJakartaEe>true</useJakartaEe>
                             </configOptions>
                         </configuration>
                     </execution>
@@ -642,6 +643,7 @@
                                 <unhandledException>true</unhandledException>
                                 <openApiNullable>false</openApiNullable>
                                 <skipDefaultInterface>true</skipDefaultInterface>
+                                <useJakartaEe>true</useJakartaEe>
                             </configOptions>
                         </configuration>
                     </execution>
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/OtelConfig.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/OtelConfig.java
index ba8e7a1d..194cf8c5 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/OtelConfig.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/OtelConfig.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.
@@ -29,7 +29,7 @@ import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSampler;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 
 import java.time.Duration;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;