Upgrading db and jdbc versions

apache · Nov 27, 2021 · 448b053 · 448b053
1 parent 2f23ffe
commit 448b053
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/...istence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java b/...istence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.core.persistence.jpa.dao;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -143,8 +144,12 @@ protected Date findLastChange(final String key, final String table) {
         Date creationDate = null;
         Date lastChangeDate = null;
         if (!result.isEmpty()) {
-            creationDate = (Date) result.get(0)[0];
-            lastChangeDate = (Date) result.get(0)[1];
+            creationDate = result.get(0)[0] instanceof LocalDateTime
+                    ? convert((LocalDateTime) result.get(0)[0])
+                    : (Date) result.get(0)[0];
+            lastChangeDate = result.get(0)[1] instanceof LocalDateTime
+                    ? convert((LocalDateTime) result.get(0)[1])
+                    : (Date) result.get(0)[1];
         }
 
         return lastChangeDate == null ? creationDate : lastChangeDate;

diff --git a/...ersistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java b/...ersistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractDAO.java
@@ -18,6 +18,9 @@
  */
 package org.apache.syncope.core.persistence.jpa.dao;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
 import javax.persistence.EntityManager;
 import org.apache.syncope.core.spring.security.AuthContextUtils;
 import org.apache.syncope.core.spring.ApplicationContextProvider;
@@ -33,6 +36,10 @@ public abstract class AbstractDAO<E extends Entity> implements DAO<E> {
 
     protected static final Logger LOG = LoggerFactory.getLogger(DAO.class);
 
+    protected Date convert(final LocalDateTime localDateTime) {
+        return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
     protected EntityManager entityManager() {
         EntityManager entityManager = EntityManagerFactoryUtils.getTransactionalEntityManager(
                 EntityManagerFactoryUtils.findEntityManagerFactory(

diff --git a/pom.xml b/pom.xml
@@ -539,12 +539,12 @@ under the License.
 
     <docker.postgresql.version>12</docker.postgresql.version>
     <docker.mysql.version>8.0</docker.mysql.version>
-    <docker.mariadb.version>10.6</docker.mariadb.version>
+    <docker.mariadb.version>10</docker.mariadb.version>
 
-    <jdbc.postgresql.version>42.2.22</jdbc.postgresql.version>
-    <jdbc.mysql.version>8.0.22</jdbc.mysql.version>
-    <jdbc.mariadb.version>2.7.3</jdbc.mariadb.version>
-    <jdbc.mssql.version>9.2.1.jre</jdbc.mssql.version>
+    <jdbc.postgresql.version>42.3.1</jdbc.postgresql.version>
+    <jdbc.mysql.version>8.0.27</jdbc.mysql.version>
+    <jdbc.mariadb.version>2.7.4</jdbc.mariadb.version>
+    <jdbc.mssql.version>9.4.0.jre</jdbc.mssql.version>
 
     <adminUser>admin</adminUser>
     <anonymousUser>anonymous</anonymousUser>