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 2018/05/23 13:44:31 UTC
syncope git commit: Upgrading to Flowable 6.3.1

Repository: syncope
Updated Branches:
  refs/heads/master 3719652c1 -> fe1d8bfc0


Upgrading to Flowable 6.3.1


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fe1d8bfc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fe1d8bfc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fe1d8bfc

Branch: refs/heads/master
Commit: fe1d8bfc085315a63f1d150cdba711a85ee55496
Parents: 3719652
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed May 23 15:44:24 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed May 23 15:44:24 2018 +0200

----------------------------------------------------------------------
 .../syncope/core/workflow/flowable/FlowableDeployUtils.java    | 2 +-
 .../core/workflow/flowable/FlowableUserWorkflowAdapter.java    | 4 ++--
 .../apache/syncope/core/workflow/flowable/SyncopeSession.java  | 2 +-
 .../syncope/core/workflow/flowable/SyncopeSessionFactory.java  | 6 +++---
 .../flowable/spring/DomainProcessEngineFactoryBean.java        | 4 ++--
 .../src/main/resources/workflowFlowableContext.xml             | 4 ++--
 pom.xml                                                        | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
index 9d0ac9f..b2c6537 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
@@ -32,7 +32,7 @@ import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.editor.constants.ModelDataJsonConstants;
 import org.flowable.editor.language.json.converter.BpmnJsonConverter;
 import org.flowable.engine.ProcessEngine;
-import org.flowable.engine.common.api.FlowableException;
+import org.flowable.common.engine.api.FlowableException;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.Model;
 import org.flowable.engine.repository.ProcessDefinition;

http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
index 69c1b30..8071eb9 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
@@ -61,8 +61,8 @@ import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.editor.constants.ModelDataJsonConstants;
 import org.flowable.editor.language.json.converter.BpmnJsonConverter;
-import org.flowable.engine.common.api.FlowableException;
-import org.flowable.engine.common.api.query.Query;
+import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.query.Query;
 import org.flowable.engine.form.FormProperty;
 import org.flowable.engine.form.FormType;
 import org.flowable.engine.form.TaskFormData;

http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSession.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSession.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSession.java
index 709a61d..71a6f57 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSession.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSession.java
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.core.workflow.flowable;
 
-import org.flowable.engine.common.impl.interceptor.Session;
+import org.flowable.common.engine.impl.interceptor.Session;
 
 public interface SyncopeSession extends Session {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSessionFactory.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSessionFactory.java
index a0420c3..f9f0550 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSessionFactory.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeSessionFactory.java
@@ -18,9 +18,9 @@
  */
 package org.apache.syncope.core.workflow.flowable;
 
-import org.flowable.engine.common.impl.interceptor.CommandContext;
-import org.flowable.engine.common.impl.interceptor.Session;
-import org.flowable.engine.common.impl.interceptor.SessionFactory;
+import org.flowable.common.engine.impl.interceptor.CommandContext;
+import org.flowable.common.engine.impl.interceptor.Session;
+import org.flowable.common.engine.impl.interceptor.SessionFactory;
 
 public class SyncopeSessionFactory implements SessionFactory {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
index fbd0f22..dba98e7 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/spring/DomainProcessEngineFactoryBean.java
@@ -23,8 +23,8 @@ import java.util.Map;
 import javax.sql.DataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.ProcessEngine;
-import org.flowable.engine.common.impl.cfg.SpringBeanFactoryProxyMap;
-import org.flowable.engine.common.impl.interceptor.EngineConfigurationConstants;
+import org.flowable.common.engine.impl.cfg.SpringBeanFactoryProxyMap;
+import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
 import org.flowable.engine.impl.util.EngineServiceUtil;
 import org.flowable.idm.spring.SpringIdmEngineConfiguration;
 import org.flowable.spring.SpringExpressionManager;

http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/core/workflow-flowable/src/main/resources/workflowFlowableContext.xml
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/resources/workflowFlowableContext.xml b/core/workflow-flowable/src/main/resources/workflowFlowableContext.xml
index 237c4c8..394a5b8 100644
--- a/core/workflow-flowable/src/main/resources/workflowFlowableContext.xml
+++ b/core/workflow-flowable/src/main/resources/workflowFlowableContext.xml
@@ -36,10 +36,10 @@ under the License.
   <bean id="syncopeIdmEngineConfiguration" class="org.flowable.idm.spring.SpringIdmEngineConfiguration">
     <property name="idmIdentityService" ref="syncopeIdmIdentityService"/> 
   </bean>
-  <bean id="syncopeIdmEngineConfigurator" class="org.flowable.spring.configurator.SpringIdmEngineConfigurator">
+  <bean id="syncopeIdmEngineConfigurator" class="org.flowable.idm.spring.configurator.SpringIdmEngineConfigurator">
     <property name="idmEngineConfiguration" ref="syncopeIdmEngineConfiguration"/> 
   </bean>
-  
+
   <bean class="org.flowable.spring.SpringProcessEngineConfiguration" scope="prototype">
     <property name="databaseSchemaUpdate" value="true"/>
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/fe1d8bfc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7816bdc..408d9a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,7 +387,7 @@ under the License.
 
     <groovy.version>3.0.0-alpha-2</groovy.version>
 
-    <flowable.version>6.3.0</flowable.version>
+    <flowable.version>6.3.1</flowable.version>
 
     <camel.version>2.21.1</camel.version>