From c6e2de2842d688e9086f01aff56b786369273ad5 Mon Sep 17 00:00:00 2001
From: JohnKeeney <john.keeney@est.tech>
Date: Wed, 13 Dec 2023 19:15:47 +0000
Subject: [PATCH] Update to Springboot & other 3PPs

Change-Id: I07b87a74fcdf355de4cbb65f5315858d6b7ca855
Signed-off-by: JohnKeeney <john.keeney@est.tech>
Issue-ID: NONRTRIC-825
---
 datafilecollector/pom.xml |  8 ++++++--
 influxlogger/pom.xml      |  9 +++++----
 pm-file-converter/main.go |  8 +++++---
 pmproducer/pom.xml        | 13 +++++++++----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/datafilecollector/pom.xml b/datafilecollector/pom.xml
index 165dd39..5a56a72 100644
--- a/datafilecollector/pom.xml
+++ b/datafilecollector/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ ============LICENSE_START=======================================================
-  ~ Copyright (C) 2023 Nordix Foundation
+  ~ Copyright (C) 2023 Nordix Foundation. All rights reserved.
+  ~ Copyright (C) 2023 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.
@@ -23,7 +24,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.2.0</version>
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt.ranpm</groupId>
     <artifactId>datafile-collector</artifactId>
@@ -35,6 +36,7 @@
         <java.version>17</java.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
         <gson.version>2.9.1</gson.version>
+        <mockito.version>4.8.1</mockito.version>
         <docker-maven-plugin>0.30.0</docker-maven-plugin>
         <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
         <springdoc.version>2.0.2</springdoc.version>
@@ -137,11 +139,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/influxlogger/pom.xml b/influxlogger/pom.xml
index 22fcb08..7b04fc0 100644
--- a/influxlogger/pom.xml
+++ b/influxlogger/pom.xml
@@ -3,7 +3,8 @@
 * ========================LICENSE_START=================================
 * O-RAN-SC
 * %%
-* Copyright (C) 2023 Nordix Foundation
+* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+* Copyright (C) 2023 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.
@@ -26,7 +27,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.2.0</version>
         <relativePath />
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -50,7 +51,7 @@
     <properties>
         <java.version>17</java.version>
         <gson.version>2.9.0</gson.version>
-        <json.version>20211205</json.version>
+        <json.version>20230227</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.24.3</spotless-maven-plugin.version>
@@ -176,7 +177,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>32.0.0-jre</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/pm-file-converter/main.go b/pm-file-converter/main.go
index 38de97d..0028951 100644
--- a/pm-file-converter/main.go
+++ b/pm-file-converter/main.go
@@ -3,7 +3,8 @@
 //	========================LICENSE_START=================================
 //	O-RAN-SC
 //	%%
-//	Copyright (C) 2023: Nordix Foundation
+//	Copyright (C) 2023: Nordix Foundation. All rights reserved.
+//	Copyright (C) 2023 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.
@@ -21,8 +22,6 @@ package main
 
 import (
 	"fmt"
-	jsoniter "github.com/json-iterator/go"
-	log "github.com/sirupsen/logrus"
 	"main/common/dataTypes"
 	"main/common/utils"
 	"main/components/kafkacollector"
@@ -33,6 +32,9 @@ import (
 	"sync"
 	"syscall"
 	"time"
+
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
 )
 
 var ics_server = os.Getenv("ICS")
diff --git a/pmproducer/pom.xml b/pmproducer/pom.xml
index 4f574c6..02c837b 100644
--- a/pmproducer/pom.xml
+++ b/pmproducer/pom.xml
@@ -3,7 +3,8 @@
 * ========================LICENSE_START=================================
 * O-RAN-SC
 * %%
-* Copyright (C) 2023 Nordix Foundation
+* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+* Copyright (C) 2023 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.
@@ -26,7 +27,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.4</version>
+        <version>3.2.0</version>
         <relativePath />
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -50,7 +51,8 @@
     <properties>
         <java.version>17</java.version>
         <gson.version>2.9.0</gson.version>
-        <json.version>20211205</json.version>
+        <json.version>20230227</json.version>
+        <mockito.version>4.8.1</mockito.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.24.3</spotless-maven-plugin.version>
@@ -156,16 +158,19 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -176,7 +181,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>32.0.0-jre</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-- 
2.16.6