(syncope) branch 3_0_X updated: Fixing MSSQL JDBC version for Docker

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/3_0_X by this push:
     new 9d8d006db6 Fixing MSSQL JDBC version for Docker
9d8d006db6 is described below

commit 9d8d006db6bf9d03b58faba86c1f115abc859a89
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue Feb 6 10:20:46 2024 +0100

    Fixing MSSQL JDBC version for Docker
---
 .../org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java     | 6 ++++--
 docker/core/pom.xml                                                 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
index 52a8dcd0f8..a16afdf54d 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
@@ -205,7 +205,7 @@ public class JPATaskDAO extends AbstractDAO<Task<?>> 
implements TaskDAO {
         return query.getResultList();
     }
 
-    protected final <T extends Task<T>> StringBuilder 
buildFindAllQueryJPA(final TaskType type) {
+    protected final <T extends Task<T>> StringBuilder buildFindAllQuery(final 
TaskType type) {
         StringBuilder builder = new StringBuilder("SELECT t FROM ").
                 
append(taskUtilsFactory.getInstance(type).getTaskEntity().getSimpleName()).
                 append(" t WHERE ");
@@ -225,7 +225,7 @@ public class JPATaskDAO extends AbstractDAO<Task<?>> 
implements TaskDAO {
     @Override
     @SuppressWarnings("unchecked")
     public <T extends Task<T>> List<T> findToExec(final TaskType type) {
-        StringBuilder queryString = buildFindAllQueryJPA(type).append("AND ");
+        StringBuilder queryString = buildFindAllQuery(type).append("AND ");
 
         if (type == TaskType.NOTIFICATION) {
             queryString.append("t.executed = false ");
@@ -497,6 +497,8 @@ public class JPATaskDAO extends AbstractDAO<Task<?>> 
implements TaskDAO {
             ((JPANotificationTask) task).list2json();
         } else if (task instanceof JPAPushTask) {
             ((JPAPushTask) task).map2json();
+        } else if (task instanceof JPAMacroTask) {
+            ((JPAMacroTask) task).list2json();
         }
         return entityManager().merge(task);
     }
diff --git a/docker/core/pom.xml b/docker/core/pom.xml
index 6aba8c7399..9b44fb7019 100644
--- a/docker/core/pom.xml
+++ b/docker/core/pom.xml
@@ -182,7 +182,7 @@ under the License.
                 <copy 
file="${settings.localRepository}/org/postgresql/postgresql/${jdbc.postgresql.version}/postgresql-${jdbc.postgresql.version}.jar"
 todir="${project.build.outputDirectory}/lib" overwrite="true"/>
                 <copy 
file="${settings.localRepository}/com/mysql/mysql-connector-j/${jdbc.mysql.version}/mysql-connector-j-${jdbc.mysql.version}.jar"
 todir="${project.build.outputDirectory}/lib" overwrite="true"/>
                 <copy 
file="${settings.localRepository}/org/mariadb/jdbc/mariadb-java-client/${jdbc.mariadb.version}/mariadb-java-client-${jdbc.mariadb.version}.jar"
 todir="${project.build.outputDirectory}/lib" overwrite="true"/>
-                <copy 
file="${settings.localRepository}/com/microsoft/sqlserver/mssql-jdbc/${jdbc.mssql.version}11/mssql-jdbc-${jdbc.mssql.version}11.jar"
 todir="${project.build.outputDirectory}/lib" overwrite="true"/>
+                <copy 
file="${settings.localRepository}/com/microsoft/sqlserver/mssql-jdbc/${jdbc.mssql.version}/mssql-jdbc-${jdbc.mssql.version}.jar"
 todir="${project.build.outputDirectory}/lib" overwrite="true"/>
                 <copy 
file="${settings.localRepository}/com/oracle/database/jdbc/ojdbc11/${jdbc.oracle.version}/ojdbc11-${jdbc.oracle.version}.jar"
 todir="${project.build.outputDirectory}/lib" overwrite="true"/>
 
                 <copy 
file="${basedir}/../../core/persistence-jpa-json/target/syncope-core-persistence-jpa-json-${project.version}.jar"
 todir="${project.build.outputDirectory}/jpa-json" overwrite="true"/>