Merge branch 'main' of github.com:flowable/flowable-engine into flowa…

…ble-release-7.2.0

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.db2.drop.app.sql

@@ -8,5 +8,3 @@ alter table ACT_APP_APPDEF
 drop table ACT_APP_APPDEF;
 drop table ACT_APP_DEPLOYMENT_RESOURCE;
 drop table ACT_APP_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.h2.drop.app.sql

@@ -5,5 +5,3 @@ drop table if exists ACT_APP_DEPLOYMENT cascade constraints;
 drop index if exists ACT_IDX_APP_RSRC_DPL;
 drop index if exists ACT_IDX_APP_DEF_DPLY;
 drop index if exists ACT_IDX_APP_DEF_UNIQ;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.mssql.drop.app.sql

@@ -6,5 +6,3 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_APP_APPDEF') drop table ACT_APP_APPDEF;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_APP_DEPLOYMENT_RESOURCE') drop table ACT_APP_DEPLOYMENT_RESOURCE;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_APP_DEPLOYMENT') drop table ACT_APP_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.mysql.drop.app.sql

@@ -8,5 +8,3 @@ alter table ACT_APP_APPDEF
 drop table if exists ACT_APP_APPDEF;
 drop table if exists ACT_APP_DEPLOYMENT_RESOURCE;
 drop table if exists ACT_APP_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.oracle.drop.app.sql

@@ -8,5 +8,3 @@ alter table ACT_APP_APPDEF
 drop table ACT_APP_APPDEF;
 drop table ACT_APP_DEPLOYMENT_RESOURCE;
 drop table ACT_APP_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.postgres.drop.app.sql

@@ -1,5 +1,3 @@
 drop table if exists ACT_APP_APPDEF cascade;
 drop table if exists ACT_APP_DEPLOYMENT_RESOURCE cascade;
 drop table if exists ACT_APP_DEPLOYMENT cascade;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.db2.drop.cmmn.sql

@@ -36,5 +36,3 @@ drop table ACT_CMMN_RU_CASE_INST;
 drop table ACT_CMMN_CASEDEF;
 drop table ACT_CMMN_DEPLOYMENT_RESOURCE;
 drop table ACT_CMMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.h2.drop.cmmn.sql

@@ -25,5 +25,3 @@ drop index if exists ACT_IDX_CASE_INST_PARENT;
 drop index if exists ACT_IDX_CASE_INST_CASE_DEF;
 drop index if exists ACT_IDX_CASE_DEF_DPLY;
 drop index if exists ACT_IDX_CMMN_RSRC_DPL;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.hsql.drop.cmmn.sql

@@ -25,5 +25,3 @@ drop index if exists ACT_IDX_CASE_INST_PARENT;
 drop index if exists ACT_IDX_CASE_INST_CASE_DEF;
 drop index if exists ACT_IDX_CASE_DEF_DPLY;
 drop index if exists ACT_IDX_CMMN_RSRC_DPL;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.mssql.drop.cmmn.sql

@@ -36,5 +36,3 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_CASEDEF') drop table ACT_CMMN_CASEDEF;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_DEPLOYMENT_RESOURCE') drop table ACT_CMMN_DEPLOYMENT_RESOURCE;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_DEPLOYMENT') drop table ACT_CMMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.mysql.drop.cmmn.sql

@@ -36,5 +36,3 @@ drop table if exists ACT_CMMN_RU_CASE_INST;
 drop table if exists ACT_CMMN_CASEDEF;
 drop table if exists ACT_CMMN_DEPLOYMENT_RESOURCE;
 drop table if exists ACT_CMMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.oracle.drop.cmmn.sql

@@ -36,5 +36,3 @@ drop table ACT_CMMN_RU_CASE_INST;
 drop table ACT_CMMN_CASEDEF;
 drop table ACT_CMMN_DEPLOYMENT_RESOURCE;
 drop table ACT_CMMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.postgres.drop.cmmn.sql

@@ -8,5 +8,3 @@ drop table ACT_CMMN_RU_CASE_INST cascade;
 drop table ACT_CMMN_CASEDEF cascade;
 drop table ACT_CMMN_DEPLOYMENT_RESOURCE cascade;
 drop table ACT_CMMN_DEPLOYMENT cascade;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.db2.drop.dmn.sql

@@ -5,5 +5,3 @@ drop table ACT_DMN_HI_DECISION_EXECUTION;
 drop table ACT_DMN_DECISION;
 drop table ACT_DMN_DEPLOYMENT_RESOURCE;
 drop table ACT_DMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.h2.drop.dmn.sql

@@ -5,5 +5,3 @@ drop table if exists ACT_DMN_DEPLOYMENT cascade constraints;
 
 drop index if exists ACT_IDX_DMN_INSTANCE_ID;
 drop index if exists ACT_IDX_DMN_DEC_UNIQ;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mssql.drop.dmn.sql

@@ -5,5 +5,3 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_DMN_DECISION') drop table ACT_DMN_DECISION;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_DMN_DEPLOYMENT_RESOURCE') drop table ACT_DMN_DEPLOYMENT_RESOURCE;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_DMN_DEPLOYMENT') drop table ACT_DMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mysql.drop.dmn.sql

@@ -5,5 +5,3 @@ drop table if exists ACT_DMN_HI_DECISION_EXECUTION;
 drop table if exists ACT_DMN_DECISION;
 drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE;
 drop table if exists ACT_DMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.oracle.drop.dmn.sql

@@ -5,5 +5,3 @@ drop table ACT_DMN_HI_DECISION_EXECUTION;
 drop table ACT_DMN_DECISION;
 drop table ACT_DMN_DEPLOYMENT_RESOURCE;
 drop table ACT_DMN_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.postgres.drop.dmn.sql

@@ -2,5 +2,3 @@ drop table if exists ACT_DMN_HI_DECISION_EXECUTION cascade;
 drop table if exists ACT_DMN_DECISION cascade;
 drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE cascade;
 drop table if exists ACT_DMN_DEPLOYMENT cascade;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.db2.drop.eventregistry.sql

@@ -5,5 +5,3 @@ drop table FLW_CHANNEL_DEFINITION;
 drop table FLW_EVENT_DEFINITION;
 drop table FLW_EVENT_RESOURCE;
 drop table FLW_EVENT_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.h2.drop.eventregistry.sql

@@ -5,5 +5,3 @@ drop table if exists FLW_CHANNEL_DEFINITION cascade constraints;
 drop table if exists FLW_EVENT_DEFINITION cascade constraints;
 drop table if exists FLW_EVENT_RESOURCE cascade constraints;
 drop table if exists FLW_EVENT_DEPLOYMENT cascade constraints;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mssql.drop.eventregistry.sql

@@ -5,5 +5,3 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_DEFINITION') drop table FLW_EVENT_DEFINITION;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_RESOURCE') drop table FLW_EVENT_RESOURCE;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_DEPLOYMENT') drop table FLW_EVENT_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mysql.drop.eventregistry.sql

@@ -5,5 +5,3 @@ drop table if exists FLW_CHANNEL_DEFINITION;
 drop table if exists FLW_EVENT_DEFINITION;
 drop table if exists FLW_EVENT_RESOURCE;
 drop table if exists FLW_EVENT_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.oracle.drop.eventregistry.sql

@@ -5,5 +5,3 @@ drop table FLW_CHANNEL_DEFINITION;
 drop table FLW_EVENT_DEFINITION;
 drop table FLW_EVENT_RESOURCE;
 drop table FLW_EVENT_DEPLOYMENT;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.postgres.drop.eventregistry.sql

@@ -2,5 +2,3 @@ drop table if exists FLW_CHANNEL_DEFINITION cascade;
 drop table if exists FLW_EVENT_DEFINITION cascade;
 drop table if exists FLW_EVENT_RESOURCE cascade;
 drop table if exists FLW_EVENT_DEPLOYMENT cascade;
-
-delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResourceTest.java

@@ -17,8 +17,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-import java.util.Calendar;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -84,12 +86,12 @@ public void resetMocks() {
     @Deployment
     public void testGetProcessTask() throws Exception {
         if (processEngineConfiguration.getHistoryLevel().isAtLeast(HistoryLevel.AUDIT)) {
-            Calendar now = Calendar.getInstance();
-            processEngineConfiguration.getClock().setCurrentTime(now.getTime());
+            Date now = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
+            processEngineConfiguration.getClock().setCurrentTime(now);
 
             ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("oneTaskProcess");
             Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
-            taskService.setDueDate(task.getId(), now.getTime());
+            taskService.setDueDate(task.getId(), now);
             taskService.setOwner(task.getId(), "owner");
             task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
             assertThat(task).isNotNull();
@@ -131,8 +133,8 @@ public void testGetProcessAdhoc() throws Exception {
         if (processEngineConfiguration.getHistoryLevel().isAtLeast(HistoryLevel.AUDIT)) {
             try {
 
-                Calendar now = Calendar.getInstance();
-                processEngineConfiguration.getClock().setCurrentTime(now.getTime());
+                Date now = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
+                processEngineConfiguration.getClock().setCurrentTime(now);
 
                 Task parentTask = taskService.newTask();
                 taskService.saveTask(parentTask);
@@ -144,7 +146,7 @@ public void testGetProcessAdhoc() throws Exception {
                 task.setAssignee("kermit");
                 task.setDelegationState(DelegationState.RESOLVED);
                 task.setDescription("Description");
-                task.setDueDate(now.getTime());
+                task.setDueDate(now);
                 task.setOwner("owner");
                 task.setPriority(20);
                 taskService.saveTask(task);