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 f765fbcd67 Upgrading Flowable
f765fbcd67 is described below
commit f765fbcd6751b8ede36e78bf26e5a649a54f1833
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Sat Feb 28 08:51:57 2026 +0100
Upgrading Flowable
---
.../core/flowable/impl/FlowableBpmnProcessManager.java | 6 +++---
.../support/DropdownAwareUserTaskJsonConverter.java | 14 +++++++-------
pom.xml | 12 +-----------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
index 166a1f29a9..186f2dd330 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableBpmnProcessManager.java
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.core.flowable.impl;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -44,6 +41,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.node.ObjectNode;
@Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = {
Throwable.class })
public class FlowableBpmnProcessManager implements BpmnProcessManager {
diff --git
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
index fec4abeb04..8d5de95139 100644
---
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
+++
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.core.flowable.support;
-import com.fasterxml.jackson.databind.JsonNode;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -30,6 +29,7 @@ import org.flowable.bpmn.model.UserTask;
import org.flowable.editor.language.json.converter.BpmnJsonConverterUtil;
import org.flowable.editor.language.json.converter.UserTaskJsonConverter;
import org.flowable.editor.language.json.converter.util.JsonConverterUtil;
+import tools.jackson.databind.JsonNode;
public class DropdownAwareUserTaskJsonConverter extends UserTaskJsonConverter {
@@ -42,10 +42,10 @@ public class DropdownAwareUserTaskJsonConverter extends
UserTaskJsonConverter {
if (propertiesArray != null) {
for (JsonNode formNode : propertiesArray) {
JsonNode formIdNode = formNode.get(PROPERTY_FORM_ID);
- if (formIdNode != null &&
StringUtils.isNotEmpty(formIdNode.asText())) {
+ if (formIdNode != null &&
StringUtils.isNotEmpty(formIdNode.asString())) {
FormProperty formProperty = new FormProperty();
- formProperty.setId(formIdNode.asText());
+ formProperty.setId(formIdNode.asString());
formProperty.setName(getValueAsString(PROPERTY_FORM_NAME, formNode));
formProperty.setType(getValueAsString(PROPERTY_FORM_TYPE, formNode));
formProperty.setExpression(getValueAsString(PROPERTY_FORM_EXPRESSION,
formNode));
@@ -67,14 +67,14 @@ public class DropdownAwareUserTaskJsonConverter extends
UserTaskJsonConverter {
&&
!enumNode.get(PROPERTY_FORM_ENUM_VALUES_NAME).isNull()) {
FormValue formValue = new FormValue();
-
formValue.setId(enumNode.get(PROPERTY_FORM_ENUM_VALUES_ID).asText());
-
formValue.setName(enumNode.get(PROPERTY_FORM_ENUM_VALUES_NAME).asText());
+
formValue.setId(enumNode.get(PROPERTY_FORM_ENUM_VALUES_ID).asString());
+
formValue.setName(enumNode.get(PROPERTY_FORM_ENUM_VALUES_NAME).asString());
formValueList.add(formValue);
} else if (enumNode.get("value") != null
&& !enumNode.get("value").isNull()) {
FormValue formValue = new FormValue();
-
formValue.setId(enumNode.get("value").asText());
-
formValue.setName(enumNode.get("value").asText());
+
formValue.setId(enumNode.get("value").asString());
+
formValue.setName(enumNode.get("value").asString());
formValueList.add(formValue);
}
}
diff --git a/pom.xml b/pom.xml
index 5f9a50cb20..1811c3de38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,7 +444,7 @@ under the License.
<groovy.version>5.0.4</groovy.version>
- <flowable.version>7.2.0</flowable.version>
+ <flowable.version>8.0.0</flowable.version>
<flowable-old.version>6.8.1</flowable-old.version>
<disruptor.version>4.0.0</disruptor.version>
@@ -1029,16 +1029,6 @@ under the License.
<groupId>org.flowable</groupId>
<artifactId>flowable-engine</artifactId>
<version>${flowable.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.flowable</groupId>
