From 186b901e3dd7e54a502edb328ec9e84c1fd3af4a Mon Sep 17 00:00:00 2001
From: egernug <gerard.nugent@est.tech>
Date: Wed, 27 Sep 2023 10:49:45 +0100
Subject: Uplift Spring Boot to 3.1.2

To align with Ericsson Spring Boot is being uplifted to version 3.1.2

Issue-ID: CPS-1888

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: Icfe97df15ab67a7fb25e0a98e4bbbbe91f332321
---
 cps-application/src/main/resources/application.yml    | 5 ++---
 cps-dependencies/pom.xml                              | 6 +++---
 cps-parent/pom.xml                                    | 2 +-
 cps-ri/src/main/resources/hibernate.cfg.xml           | 2 +-
 integration-test/src/test/resources/hibernate.cfg.xml | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 016356801d..7beab2e7c9 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -37,9 +37,8 @@ spring:
         ddl-auto: create
         open-in-view: false
         properties:
-            hibernate:
-                enable_lazy_load_no_trans: true
-                dialect: org.hibernate.dialect.PostgreSQLDialect
+            hibernate.enable_lazy_load_no_trans: true
+            hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
 
     datasource:
         url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 16f76b91db..f6931c302b 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -78,7 +78,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -104,7 +104,7 @@
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-boot-starter</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.2</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
@@ -259,7 +259,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.14.0</version>
+                <version>2.15.2</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 248bc28cbb..41215567c7 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -118,7 +118,7 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.2</version>
                     <executions>
                         <execution>
                             <goals>
diff --git a/cps-ri/src/main/resources/hibernate.cfg.xml b/cps-ri/src/main/resources/hibernate.cfg.xml
index 98e6cfc5b7..1b822b9de9 100644
--- a/cps-ri/src/main/resources/hibernate.cfg.xml
+++ b/cps-ri/src/main/resources/hibernate.cfg.xml
@@ -9,7 +9,7 @@
         <property name="hibernate.connection.url">jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb</property>
         <property name="hibernate.connection.username">${DB_USERNAME}</property>
         <property name="hibernate.connection.password">${DB_PASSWORD}</property>
-        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL82Dialect</property>
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
         <property name="show_sql">true</property>
         <property name="hibernate.hbm2ddl.auto">update</property>
     </session-factory>
diff --git a/integration-test/src/test/resources/hibernate.cfg.xml b/integration-test/src/test/resources/hibernate.cfg.xml
index 513c00ad2a..8d5139b605 100644
--- a/integration-test/src/test/resources/hibernate.cfg.xml
+++ b/integration-test/src/test/resources/hibernate.cfg.xml
@@ -9,7 +9,7 @@
         <property name="hibernate.connection.url">${DB_URL}</property>
         <property name="hibernate.connection.username">${DB_USERNAME}</property>
         <property name="hibernate.connection.password">${DB_PASSWORD}</property>
-        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL82Dialect</property>
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
         <property name="show_sql">true</property>
         <property name="hibernate.hbm2ddl.auto">none</property>
     </session-factory>
-- 
cgit 1.2.3-korg