Upgrading Groovy, Flowable, JUnit
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/26edcb87 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/26edcb87 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/26edcb87 Branch: refs/heads/master Commit: 26edcb87c645e0a4ff2bacaec576e09d96709b96 Parents: 3ce9281 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Nov 23 15:35:52 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Nov 23 15:35:52 2017 +0100 ---------------------------------------------------------------------- .../workflow/flowable/FlowableUserWorkflowAdapter.java | 4 ++-- .../workflow/flowable/SyncopeEntitiesVariableType.java | 2 +- pom.xml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/26edcb87/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 2862380..22af442 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 @@ -67,13 +67,13 @@ import org.flowable.engine.form.FormProperty; import org.flowable.engine.form.FormType; import org.flowable.engine.form.TaskFormData; import org.flowable.engine.history.HistoricActivityInstance; -import org.flowable.engine.history.HistoricTaskInstance; import org.flowable.engine.impl.persistence.entity.HistoricFormPropertyEntity; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.Model; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; -import org.flowable.engine.task.Task; +import org.flowable.task.api.Task; +import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; http://git-wip-us.apache.org/repos/asf/syncope/blob/26edcb87/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeEntitiesVariableType.java ---------------------------------------------------------------------- diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeEntitiesVariableType.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeEntitiesVariableType.java index 7fd0faa..81c2d88 100644 --- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeEntitiesVariableType.java +++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/SyncopeEntitiesVariableType.java @@ -19,7 +19,7 @@ package org.apache.syncope.core.workflow.flowable; import org.apache.syncope.core.persistence.api.entity.Entity; -import org.flowable.engine.impl.variable.SerializableType; +import org.flowable.variable.service.impl.types.SerializableType; /** * Flowable variable type for handling Syncope entities as Flowable variables. http://git-wip-us.apache.org/repos/asf/syncope/blob/26edcb87/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a30689b..1a44f2a 100644 --- a/pom.xml +++ b/pom.xml @@ -382,9 +382,9 @@ under the License. <cocoon.version>3.0.0-alpha-3</cocoon.version> - <groovy.version>2.4.12</groovy.version> + <groovy.version>2.5.0-beta-2</groovy.version> - <flowable.version>6.1.2</flowable.version> + <flowable.version>6.2.0</flowable.version> <camel.version>2.19.3</camel.version> @@ -407,7 +407,7 @@ under the License. <h2.version>1.4.196</h2.version> - <junit.version>5.0.2</junit.version> + <junit.version>5.1.0-M1</junit.version> <conf.directory>${project.build.directory}/test-classes</conf.directory> <bundles.directory>${project.build.directory}/bundles</bundles.directory> @@ -1835,7 +1835,7 @@ under the License. <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-surefire-provider</artifactId> - <version>1.0.2</version> + <version>1.1.0-M1</version> </dependency> </dependencies> </plugin> @@ -1853,7 +1853,7 @@ under the License. <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-surefire-provider</artifactId> - <version>1.0.2</version> + <version>1.1.0-M1</version> </dependency> </dependencies> <executions>
