From a88e7e03d172d1f1fb39be2c8f958eaf4ee50c30 Mon Sep 17 00:00:00 2001
From: PatrikBuhr <patrik.buhr@est.tech>
Date: Mon, 23 Jan 2023 10:33:59 +0100
Subject: [PATCH] Updated to springboot v 2.7.7

Uplifted a lot of other dependencies.

Uplift of source from ONAP.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-743
Change-Id: I14091eb5cea1ede34de96c9c56baf8c6edbb4021
---
 .gitmodules             |  1 +
 config/application.yaml |  8 +++++++-
 onap/oran               |  2 +-
 pom.xml                 | 37 ++++++++++++++++++-------------------
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 5056419..b93d386 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "onap/oran"]
 	path = onap/oran
 	url = https://gerrit.onap.org/r/ccsdk/oran
+	update = rebase
diff --git a/config/application.yaml b/config/application.yaml
index 2bd8d83..8f37aaa 100644
--- a/config/application.yaml
+++ b/config/application.yaml
@@ -31,7 +31,12 @@ management:
     web:
       exposure:
         # Enabling of springboot actuator features. See springboot documentation.
-        include: "loggers,logfile,health,info,metrics,threaddump,heapdump"
+        include: "loggers,logfile,health,info,metrics,threaddump,heapdump,shutdown"
+  endpoint:
+    shutdown:
+      enabled: true
+lifecycle:
+  timeout-per-shutdown-phase: "20s"
 springdoc:
   show-actuator: true
 logging:
@@ -53,6 +58,7 @@ server:
    # See springboot documentation.
    port : 8433
    http-port: 8081
+   shutdown: "graceful"
    ssl:
       key-store-type: JKS
       key-store-password: policy_agent
diff --git a/onap/oran b/onap/oran
index 123ba96..aee1110 160000
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit 123ba96ee12d73d89aac9e274ae9e3cffe7249ea
+Subproject commit aee111025016696c6aa5ffe1f86acdb731a7ff0f
diff --git a/pom.xml b/pom.xml
index 37871fe..859842b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 * ========================LICENSE_START=================================
 * O-RAN-SC
 * %%
-* Copyright (C) 2019 Nordix Foundation
+* Copyright (C) 2019-2023 Nordix Foundation
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.11</version>
+        <version>2.7.7</version>
         <relativePath />
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -48,18 +48,17 @@
     <properties>
         <java.version>11</java.version>
         <springfox.version>3.0.0</springfox.version>
-        <gson.version>2.9.0</gson.version>
-        <swagger.version>2.1.13</swagger.version>
-        <json.version>20220320</json.version>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <formatter-maven-plugin.version>2.12.2</formatter-maven-plugin.version>
-        <spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version>
+        <swagger.version>2.2.8</swagger.version>
+        <json.version>20220924</json.version>
+        <maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
+        <formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
+        <spotless-maven-plugin.version>2.30.0</spotless-maven-plugin.version>
         <docker-maven-plugin>0.30.0</docker-maven-plugin>
         <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
         <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
-        <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-        <software.amazon.awssdk.version>2.17.292</software.amazon.awssdk.version>
+        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
+        <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+        <software.amazon.awssdk.version>2.19.17</software.amazon.awssdk.version>
     </properties>
     <dependencies>
         <dependency>
@@ -70,7 +69,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>31.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -93,6 +92,10 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webflux</artifactId>
@@ -107,10 +110,6 @@
             <artifactId>swagger-jaxrs2-servlet-initializer</artifactId>
             <version>${swagger.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -157,10 +156,10 @@
             <version>${springfox.version}</version>
         </dependency>
         <!-- TEST -->
-         <dependency>
+        <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.6.6</version>
+            <version>1.6.14</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -202,7 +201,7 @@
         <dependency>
             <groupId>com.github.erosb</groupId>
             <artifactId>everit-json-schema</artifactId>
-            <version>1.13.0</version>
+            <version>1.14.1</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-- 
2.16.6