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 2020/08/21 10:22:51 UTC
[syncope] branch master updated (c736cde -> 44d6785)
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 c736cde [SYNCOPE-1585] Fix keystore for Docker
new 662f9be Upgrading Elasticsearch, Mockito and Swagger UI
new 44d6785 [SYNCOPE-1575] For suspend / reactivate, pass PropagationByResource instance from workflow execution back to ProvisioningManager
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:
.../flowable/impl/FlowableUserWorkflowAdapter.java | 28 ++++++++++++++++++++--
pom.xml | 6 ++---
2 files changed, 29 insertions(+), 5 deletions(-)
[syncope] 01/02: Upgrading Elasticsearch, Mockito and Swagger UI
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 662f9be0c83fe4dd65947fdd66b397b2a41679c6
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Aug 19 17:53:34 2020 +0200
Upgrading Elasticsearch, Mockito and Swagger UI
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b1a960..d88538e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@ under the License.
<slf4j.version>2.0.0-alpha1</slf4j.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
+ <elasticsearch.version>7.9.0</elasticsearch.version>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apachedirapi.version>2.0.0</apachedirapi.version>
@@ -455,10 +455,10 @@ under the License.
<h2.version>1.4.200</h2.version>
<junit.version>5.6.2</junit.version>
- <mockito.version>3.5.0</mockito.version>
+ <mockito.version>3.5.2</mockito.version>
<swagger-core.version>2.1.4</swagger-core.version>
- <swagger-ui.version>3.31.1</swagger-ui.version>
+ <swagger-ui.version>3.32.1</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
[syncope] 02/02: [SYNCOPE-1575] For suspend / reactivate,
pass PropagationByResource instance from workflow execution back to
ProvisioningManager
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 44d678579e6ee50cbc4f937bb8773af089e81dc0
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Aug 21 12:02:58 2020 +0200
[SYNCOPE-1575] For suspend / reactivate, pass PropagationByResource instance from workflow execution back to ProvisioningManager
---
.../flowable/impl/FlowableUserWorkflowAdapter.java | 28 ++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
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 9ebf396..e827345 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
@@ -317,11 +317,23 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter imp
FlowableRuntimeUtils.updateStatus(engine, procInstID, user);
User updated = userDAO.save(user);
+ @SuppressWarnings("unchecked")
+ PropagationByResource<String> propByRes = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+
+ @SuppressWarnings("unchecked")
+ PropagationByResource<Pair<String, String>> propByLinkedAccount = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
+
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.TASK);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.USER);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.WF_EXECUTOR);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
- return new UserWorkflowResult<>(updated.getKey(), null, null, performedTasks);
+ return new UserWorkflowResult<>(updated.getKey(), propByRes, propByLinkedAccount, performedTasks);
}
@Override
@@ -335,11 +347,23 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter imp
FlowableRuntimeUtils.updateStatus(engine, procInstID, user);
User updated = userDAO.save(user);
+ @SuppressWarnings("unchecked")
+ PropagationByResource<String> propByRes = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+
+ @SuppressWarnings("unchecked")
+ PropagationByResource<Pair<String, String>> propByLinkedAccount = engine.getRuntimeService().getVariable(
+ procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT, PropagationByResource.class);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
+
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.TASK);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.USER);
engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.WF_EXECUTOR);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE);
+ engine.getRuntimeService().removeVariable(procInstID, FlowableRuntimeUtils.PROP_BY_LINKEDACCOUNT);
- return new UserWorkflowResult<>(updated.getKey(), null, null, performedTasks);
+ return new UserWorkflowResult<>(updated.getKey(), propByRes, propByLinkedAccount, performedTasks);
}
@Override