(syncope) branch master updated: Upgrading Tomcat

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 609c48beaa Upgrading Tomcat
609c48beaa is described below

commit 609c48beaab4827d643bb06c648b525a6d5fbc51
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Jan 28 08:12:48 2026 +0100

    Upgrading Tomcat
---
 .../apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java   | 8 ++++++++
 pom.xml                                                           | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
 
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
index 8a7bef5cd0..0251ab76c2 100644
--- 
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
+++ 
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
@@ -55,6 +55,7 @@ import 
org.apache.syncope.core.persistence.neo4j.entity.Neo4jRealm;
 import org.apache.syncope.core.persistence.neo4j.entity.task.AbstractTask;
 import 
org.apache.syncope.core.persistence.neo4j.entity.task.Neo4jAnyTemplatePullTask;
 import 
org.apache.syncope.core.persistence.neo4j.entity.task.Neo4jFormPropertyDef;
+import org.apache.syncope.core.persistence.neo4j.entity.task.Neo4jLiveSyncTask;
 import org.apache.syncope.core.persistence.neo4j.entity.task.Neo4jMacroTask;
 import 
org.apache.syncope.core.persistence.neo4j.entity.task.Neo4jMacroTaskCommand;
 import 
org.apache.syncope.core.persistence.neo4j.entity.task.Neo4jNotificationTask;
@@ -100,6 +101,10 @@ public class Neo4jTaskDAO extends AbstractDAO implements 
TaskDAO {
                 result = Neo4jPullTask.PULL_TASK_EXEC_REL;
                 break;
 
+            case LIVE_SYNC:
+                result = Neo4jLiveSyncTask.LIVE_SYNC_TASK_EXEC_REL;
+                break;
+
             case MACRO:
                 result = Neo4jMacroTask.MACRO_TASK_EXEC_REL;
                 break;
@@ -167,6 +172,9 @@ public class Neo4jTaskDAO extends AbstractDAO implements 
TaskDAO {
     @Override
     public Optional<? extends Task<?>> findById(final String key) {
         Optional<? extends Task<?>> task = findById(TaskType.SCHEDULED, key);
+        if (task.isEmpty()) {
+            task = findById(TaskType.LIVE_SYNC, key);
+        }
         if (task.isEmpty()) {
             task = findById(TaskType.PULL, key);
         }
diff --git a/pom.xml b/pom.xml
index 7bd6f5dc3b..84ba11bd30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,7 +523,7 @@ under the License.
     <cargo.rmi.port>9805</cargo.rmi.port>
     <cargo.deployable.ping.timeout>60000</cargo.deployable.ping.timeout>
 
-    <tomcat.version>10.1.50</tomcat.version>
+    <tomcat.version>10.1.52</tomcat.version>
     <wildfly.version>39.0.0.Final</wildfly.version>
     <payara.version>6.2025.11</payara.version>
     <jakarta.faces.version>4.1.6</jakarta.faces.version>