This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_0_X by this push:
new a634e9ba9b Upgrading Tomcat and Spring Cloud Gateway
a634e9ba9b is described below
commit a634e9ba9bc93183dd3ca04b7c9afedcd834394f
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Sep 9 08:26:54 2025 +0200
Upgrading Tomcat and Spring Cloud Gateway
---
ext/flowable/flowable-bpmn/pom.xml | 5 -----
.../core/flowable/impl/FlowableUserWorkflowAdapter.java | 12 +++++++++---
pom.xml | 4 ++--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ext/flowable/flowable-bpmn/pom.xml
b/ext/flowable/flowable-bpmn/pom.xml
index bc946c9367..8b475c4d2a 100644
--- a/ext/flowable/flowable-bpmn/pom.xml
+++ b/ext/flowable/flowable-bpmn/pom.xml
@@ -38,11 +38,6 @@ under the License.
</properties>
<dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
-
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-engine</artifactId>
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
index a807e50d32..20179f92a6 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
@@ -19,6 +19,7 @@
package org.apache.syncope.core.flowable.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -59,6 +60,7 @@ import org.flowable.task.api.Task;
import org.identityconnectors.framework.common.objects.SyncDeltaType;
import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter
implements WorkflowTaskManager {
@@ -220,13 +222,17 @@ public class FlowableUserWorkflowAdapter extends
AbstractUserWorkflowAdapter imp
return Set.of();
}
+ tasks.sort(Comparator.comparing(Task::getCreateTime).reversed());
+
Task task = tasks.removeFirst();
try {
- engine.getTaskService().complete(task.getId(), variables);
-
if (!tasks.isEmpty()) {
-
engine.getTaskService().deleteTasks(tasks.stream().map(Task::getId).toList());
+ new NamedParameterJdbcTemplate(engine.getDataSource()).update(
+ "DELETE FROM ACT_RU_TASK WHERE id_ IN (:tasks)",
+ Map.of("tasks",
tasks.stream().map(Task::getId).toList()));
}
+
+ engine.getTaskService().complete(task.getId(), variables);
} catch (FlowableException e) {
FlowableRuntimeUtils.throwException(
e, "While completing task '" + task.getName() + "' for " +
user);
diff --git a/pom.xml b/pom.xml
index 9d376a4b6d..c300c64eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -416,7 +416,7 @@ under the License.
<nimbus-jose-jwt.version>10.4.2</nimbus-jose-jwt.version>
<spring-boot.version>3.4.9</spring-boot.version>
- <spring-cloud-gateway.version>4.2.4</spring-cloud-gateway.version>
+ <spring-cloud-gateway.version>4.2.5</spring-cloud-gateway.version>
<openjpa.version>4.1.1</openjpa.version>
@@ -505,7 +505,7 @@ under the License.
<cargo.rmi.port>9805</cargo.rmi.port>
<cargo.deployable.ping.timeout>60000</cargo.deployable.ping.timeout>
- <tomcat.version>10.1.44</tomcat.version>
+ <tomcat.version>10.1.45</tomcat.version>
<wildfly.version>37.0.1.Final</wildfly.version>
<payara.version>6.2025.9</payara.version>
<jakarta.faces.version>4.1.3</jakarta.faces.version>
