From 7664c011ed2e069641a2bf57cc204aa980262c43 Mon Sep 17 00:00:00 2001
From: JohnKeeney <john.keeney@est.tech>
Date: Mon, 11 Dec 2023 17:17:52 +0000
Subject: [PATCH] Update A1-PMS to ONAP London version, and bump sprimgboot to
 3.2.0

Change-Id: Idc8e8a5cea7ed5cd464186e50d2d0b471ce1b10a
Signed-off-by: JohnKeeney <john.keeney@est.tech>
Issue-ID: NONRTRIC-825
---
 onap/oran |  2 +-
 pom.xml   | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/onap/oran b/onap/oran
index 9f1d949..ff95ae4 160000
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit 9f1d9499e4e1ca40fddffb195353148cc3271b9c
+Subproject commit ff95ae47d58dfc2ac01ccbfb994b615f975d1675
diff --git a/pom.xml b/pom.xml
index aba25a2..dcc295e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,8 @@
 * ========================LICENSE_START=================================
 * O-RAN-SC
 * %%
-* Copyright (C) 2019-2023 Nordix Foundation
+* Copyright (C) 2019-2023: Nordix Foundation
+* Copyright (C) 2023: OpenInfra Foundation Europe
 * %%
 * 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.6</version>
+        <version>3.2.0</version>
         <relativePath />
     </parent>
     <groupId>org.o-ran-sc.nonrtric.plt</groupId>
@@ -47,28 +48,30 @@
     </repositories>
     <properties>
         <java.version>17</java.version>
-        <json.version>20230227</json.version>
+        <json.version>20231013</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>
+        <docker-maven-plugin>0.43.0</docker-maven-plugin>
         <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.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>
         <springdoc.version>2.0.2</springdoc.version>
         <springdoc.openapi-ui.version>1.6.14</springdoc.openapi-ui.version>
+        <surefire-maven-plugin.version>3.0.0-M8</surefire-maven-plugin.version>
+        <surefire-report-plugin.version>3.0.0-M8</surefire-report-plugin.version>
     </properties>
     <dependencies>    
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -176,7 +179,6 @@
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.github.erosb/everit-json-schema -->
         <dependency>
             <groupId>com.github.erosb</groupId>
             <artifactId>everit-json-schema</artifactId>
@@ -201,6 +203,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-maven-plugin.version}</version>
                 <configuration>
                     <skipTests>false</skipTests>
                 </configuration>
@@ -361,4 +364,13 @@
         <system>JIRA</system>
         <url>https://jira.o-ran-sc.org/</url>
     </issueManagement>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>${surefire-report-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
-- 
2.16.6