From 7d51dffec65e4c327aa61e86f9dcf9aa2d4de2ae Mon Sep 17 00:00:00 2001
From: teijosol <teijosol@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:25:18 +0200
Subject: [PATCH] Feature/dpo 2108 hibernate (#114)

* DPO-2108 upgrade spring boot

* DPO-2108 upgrade spring-cloud

* DPO-2108 version upgrades and degrades

* DPO-2108 upgrade setup-java, remove deprecated dialect setting

* DPO-2108 remove old comments
---
 .github/workflows/build.yml               |  2 +-
 .github/workflows/codeql-analysis.yml     |  2 +-
 .github/workflows/install.yml             |  2 +-
 pom.xml                                   | 16 ++++++----------
 src/main/resources/application.properties |  1 -
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ad7eac84..9d0906696 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup dependencies
         run: cp -R digitraffic-build-dependencies/jms/ ~/.m2/
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: corretto
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b88d59c8e..b328e5f83 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Setup dependencies
         run: cp -R digitraffic-build-dependencies/jms/ ~/.m2/
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: corretto
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 49aa35255..a88d10c91 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Setup dependencies
         run: cp -R digitraffic-build-dependencies/jms/ ~/.m2/
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: corretto
diff --git a/pom.xml b/pom.xml
index e81d2c5cc..6abcffebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <!-- check hibernate-core dependency when updating! -->
         <version>3.1.8</version>
         <relativePath/>
     </parent>
@@ -24,7 +23,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
         <maven.compiler.release>17</maven.compiler.release>
-        <com.google.protobuf.version>3.25.2</com.google.protobuf.version>
+        <com.google.protobuf.version>3.25.3</com.google.protobuf.version>
         <org.apache.cxf.version>4.0.3</org.apache.cxf.version>
         <org.glassfish.metro.ws.version>4.0.3</org.glassfish.metro.ws.version>
         <spring.cloud.version>4.0.5</spring.cloud.version>
@@ -72,13 +71,10 @@
     </repositories>
 
     <dependencies>
-        <!-- remove this when spring boot is updated to use this! -->
-        <dependency><groupId>org.hibernate.orm</groupId><artifactId>hibernate-core</artifactId><version>6.3.1.Final</version></dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
-            <version>${spring.cloud.version}</version>
+            <version>4.0.5</version>
         </dependency>
 
         <dependency>
@@ -96,7 +92,7 @@
         <dependency>
             <groupId>com.amazonaws.secretsmanager</groupId>
             <artifactId>aws-secretsmanager-jdbc</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
 
         <dependency>
@@ -334,14 +330,14 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-spatial</artifactId>
-            <version>6.4.3.Final</version>
+            <version>6.4.4.Final</version>
         </dependency>
 
         <!-- json column type -->
         <dependency>
             <groupId>io.hypersistence</groupId>
             <artifactId>hypersistence-utils-hibernate-63</artifactId>
-            <version>3.7.1</version>
+            <version>3.7.3</version>
         </dependency>
 
         <!-- Library to transform GeoJSON <-> jts Geometry.
@@ -367,7 +363,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.651</version>
+            <version>1.12.661</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e7d118ee2..aab218ff5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,7 +15,6 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
 # Default transaction timeout in seconds.
 spring.transaction.default-timeout=600
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 # OSIV is enabled by default. Disable it.
 spring.jpa.open-in-view=false