You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/08/31 11:23:24 UTC
[syncope] branch master updated (d184cea -> 21d4bc5)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from d184cea Upgrading JSoup
new b76306c Upgrading Flowable
new 21d4bc5 Upgrading Tika
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/flowable/impl/FlowableUserRequestHandler.java | 11 ++++++-----
.../core/flowable/support/DomainProcessEngineFactoryBean.java | 4 ++--
pom.xml | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
[syncope] 01/02: Upgrading Flowable
Posted by il...@apache.org.
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
commit b76306ca086f03b55d7f351aac274f8a49eca2ac
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Aug 31 12:50:43 2021 +0200
Upgrading Flowable
---
.../core/flowable/impl/FlowableUserRequestHandler.java | 11 ++++++-----
.../core/flowable/support/DomainProcessEngineFactoryBean.java | 4 ++--
pom.xml | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
index 728ea42..f7236ff 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserRequestHandler.java
@@ -473,7 +473,7 @@ public class FlowableUserRequestHandler implements UserRequestHandler {
return adminUser.equals(authUser)
? getForm(getTask(taskId))
- : getForm(query.taskCandidateOrAssigned(authUser).singleResult());
+ : getForm(query.or().taskCandidateUser(authUser).taskAssignee(authUser).endOr().singleResult());
}
@Transactional(readOnly = true)
@@ -482,7 +482,7 @@ public class FlowableUserRequestHandler implements UserRequestHandler {
final String userKey,
final int page,
final int size,
- final List<OrderByClause> orderByClauses) {
+ final List<OrderByClause> ob) {
TaskQuery query = engine.getTaskService().createTaskQuery().taskWithFormKey();
if (userKey != null) {
@@ -491,8 +491,8 @@ public class FlowableUserRequestHandler implements UserRequestHandler {
String authUser = AuthContextUtils.getUsername();
return adminUser.equals(authUser)
- ? getForms(query, page, size, orderByClauses)
- : getForms(query.taskCandidateOrAssigned(authUser), page, size, orderByClauses);
+ ? getForms(query, page, size, ob)
+ : getForms(query.or().taskCandidateUser(authUser).taskAssignee(authUser).endOr(), page, size, ob);
}
protected Pair<Integer, List<UserRequestForm>> getForms(
@@ -580,7 +580,8 @@ public class FlowableUserRequestHandler implements UserRequestHandler {
String authUser = AuthContextUtils.getUsername();
if (!adminUser.equals(authUser)) {
List<Task> tasksForUser = engine.getTaskService().createTaskQuery().
- taskWithFormKey().taskId(taskId).taskCandidateOrAssigned(authUser).list();
+ taskWithFormKey().taskId(taskId).
+ or().taskCandidateUser(authUser).taskAssignee(authUser).endOr().list();
if (tasksForUser.isEmpty()) {
throw new WorkflowException(
new IllegalArgumentException(authUser + " is not candidate nor assignee of task " + taskId));
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
index 5747d63..425fe87 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
@@ -27,9 +27,9 @@ import org.apache.syncope.core.persistence.api.DomainHolder;
import org.apache.syncope.core.persistence.api.SyncopeCoreLoader;
import org.flowable.common.engine.impl.cfg.SpringBeanFactoryProxyMap;
import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.impl.el.ProcessExpressionManager;
import org.flowable.engine.impl.util.EngineServiceUtil;
import org.flowable.idm.spring.SpringIdmEngineConfiguration;
-import org.flowable.spring.SpringExpressionManager;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +79,7 @@ public class DomainProcessEngineFactoryBean
conf.setBeans(new SpringBeanFactoryProxyMap(ctx));
}
if (conf.getExpressionManager() == null) {
- conf.setExpressionManager(new SpringExpressionManager(ctx, conf.getBeans()));
+ conf.setExpressionManager(new ProcessExpressionManager(conf.getBeans()));
}
if (EngineServiceUtil.getIdmEngineConfiguration(conf) == null) {
SpringIdmEngineConfiguration spiec = ctx.getBean(SpringIdmEngineConfiguration.class);
diff --git a/pom.xml b/pom.xml
index 6b5cd1a..10bfe9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,7 +426,7 @@ under the License.
<groovy.version>4.0.0-alpha-3</groovy.version>
- <flowable.version>6.6.0</flowable.version>
+ <flowable.version>6.7.0</flowable.version>
<camel.version>3.11.1</camel.version>
[syncope] 02/02: Upgrading Tika
Posted by il...@apache.org.
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
commit 21d4bc556281e975d2542e5280c7e58668a8f802
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Aug 31 12:54:19 2021 +0200
Upgrading Tika
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 10bfe9c..806bc98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1045,7 +1045,7 @@ under the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
</dependency>
<dependency>