From ec24501bef561e65052a5de28176e4148100c434 Mon Sep 17 00:00:00 2001
From: "saul.gill" <saul.gill@est.tech>
Date: Wed, 8 Oct 2025 14:43:55 +0100
Subject: [PATCH] Update springboot version and dependencies

Issue-ID: NONRTRIC-1085
Change-Id: I74387bd8ff24b315a9e7ae3bbc9d331bcf67f082
Signed-off-by: saul.gill <saul.gill@est.tech>
---
 Dockerfile |  4 ++--
 onap/oran  |  2 +-
 pom.xml    | 27 ++++++++++++++++++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 98a4e31..b79b0e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM amazoncorretto:17-alpine as jre-build
+FROM nexus3.onap.org:10001/library/amazoncorretto:21-alpine3.22-jdk as jre-build
 
 RUN apk add binutils
 RUN $JAVA_HOME/bin/jlink \
@@ -31,7 +31,7 @@ RUN $JAVA_HOME/bin/jlink \
 --output /customjre
 
 # Use debian base image (same as openjdk uses)
-FROM amazoncorretto:17-alpine
+FROM nexus3.onap.org:10001/library/amazoncorretto:21-alpine3.22-jdk
 
 ENV JAVA_HOME=/jre
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
diff --git a/onap/oran b/onap/oran
index 9effe42..34f6f29 160000
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit 9effe422a9b74e106107f0a91d56a72341bed93a
+Subproject commit 34f6f2913aed8a05a502a1ffc53a58109085fc1c
diff --git a/pom.xml b/pom.xml
index 0df1cfc..1ce6f0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.3</version>
+        <version>3.5.6</version>
         <relativePath/>
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -48,11 +48,11 @@
     </repositories>
     <properties>
         <java.version>17</java.version>
-        <software.amazon.awssdk.version>2.31.57</software.amazon.awssdk.version>
+        <software.amazon.awssdk.version>2.32.33</software.amazon.awssdk.version>
         <json.version>20250517</json.version>
         <commons-io.version>2.19.0</commons-io.version>
         <guava.version>33.4.8-jre</guava.version>
-        <squareup.okhttp.version>5.0.0-alpha.16</squareup.okhttp.version>
+        <squareup.okhttp.version>5.1.0</squareup.okhttp.version>
         <surefire-maven-plugin.version>3.5.3</surefire-maven-plugin.version>
         <surefire-report-plugin.version>3.5.3</surefire-report-plugin.version>
         <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
@@ -76,9 +76,11 @@
         <opentelemetry-instrumentation-bom-alpha.version>2.7.0-alpha</opentelemetry-instrumentation-bom-alpha.version>
         <skiptests>false</skiptests>
         <skipgitsubmodule>false</skipgitsubmodule>
-        <version.logback>8.1</version.logback>
-        <spring.boot.version>3.5.3</spring.boot.version>
+        <version.logstash>8.1</version.logstash>
+        <version.logback>1.5.19</version.logback>
+        <spring.boot.version>3.5.6</spring.boot.version>
         <version.kotlin>2.1.21</version.kotlin>
+        <version.java.protobuf>4.31.1</version.java.protobuf>
     </properties>
     <dependencies>
         <dependency>
@@ -291,6 +293,16 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
+            <version>${version.logstash}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${version.logback}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
             <version>${version.logback}</version>
         </dependency>
         <dependency>
@@ -298,6 +310,11 @@
             <artifactId>kotlin-stdlib</artifactId>
             <version>${version.kotlin}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>${version.java.protobuf}</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
-- 
2.16.6