Fix upgrade tests

modules/flowable-engine-common/src/main/java/org/flowable/engine/common/AbstractEngineConfiguration.java

@@ -414,7 +414,7 @@ public abstract class AbstractEngineConfiguration {
 
     public void initSchemaCommandConfig() {
         if (schemaCommandConfig == null) {
-            schemaCommandConfig = new CommandConfig().transactionNotSupported();
+            schemaCommandConfig = new CommandConfig();
         }
     }
     

modules/flowable-engine-common/src/main/java/org/flowable/engine/common/impl/db/AbstractSqlScriptBasedDbSchemaManager.java

@@ -165,47 +165,6 @@ public abstract class AbstractSqlScriptBasedDbSchemaManager implements DbSchemaM
         }
     }
     
-    public void setProperty(String propertyName, String value) {
-        
-        String tableName = getPropertyTable();
-        if (!getDbSqlSession().getDbSqlSessionFactory().isTablePrefixIsSchema()) {
-            tableName = prependDatabaseTablePrefix(tableName);
-        }
-        
-        PreparedStatement statement = null;
-        PreparedStatement statement2 = null;
-        try {
-            statement = getDbSqlSession().getSqlSession().getConnection()
-                    .prepareStatement("update " + tableName + " set VALUE_ = ? where NAME_ = ?");
-            statement.setString(1, value);
-            statement.setString(2, propertyName);
-            int result = statement.executeUpdate();
-            
-            // Property does not exist yet, insert the property
-            if (result == 0) {
-                statement2 = getDbSqlSession().getSqlSession().getConnection()
-                        .prepareStatement("insert into " + tableName + "(NAME_, VALUE_, REV_) values(?, ?, ?)");
-                statement2.setString(1, propertyName);
-                statement2.setString(2, value);
-                statement2.setInt(3, 1);
-                statement2.executeUpdate();
-            }
-        } catch (SQLException e) {
-            throw new FlowableException("Could not set property " + propertyName + " in " + tableName, e);
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException e) { }
-            }
-            if (statement2 != null) {
-                try {
-                    statement2.close();
-                } catch (SQLException e) { }
-            }
-        }
-    }
-    
     protected String getPropertyTable() {
         return PROPERTY_TABLE;
     }

modules/flowable-engine-common/src/main/java/org/flowable/engine/common/impl/db/ServiceSqlScriptBasedDbSchemaManager.java

@@ -79,10 +79,6 @@ public abstract class ServiceSqlScriptBasedDbSchemaManager extends AbstractSqlSc
                 if (isHistoryUsed()) {
                     dbSchemaUpgrade(schemaComponentHistory, matchingVersionIndex);
                 }
-                
-                if (dbVersion != null) {
-                    setProperty(schemaVersionProperty, FlowableVersions.CURRENT_VERSION);
-                }
             }
             
             feedback = "upgraded from " + compareWithVersion + " to " + FlowableVersions.CURRENT_VERSION;

modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/db/upgrade/flowable.all.upgradestep.6120.to.6200.identitylink.sql

+insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '6.2.0.0', 1);
\ No newline at end of file

modules/flowable-job-service/src/main/resources/org/flowable/job/db/upgrade/flowable.all.upgradestep.6120.to.6200.job.sql

+insert into ACT_GE_PROPERTY values ('job.schema.version', '6.2.0.0', 1);
\ No newline at end of file

modules/flowable-task-service/src/main/resources/org/flowable/task/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.history.sql

-alter table ACT_HI_TASKINST add column SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_TYPE_ nvarchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ nvarchar(255);
+alter table ACT_HI_TASKINST add SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_TASKINST add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_TASKINST add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_HI_TASKINST add SCOPE_DEFINITION_ID_ nvarchar(255);
 
 create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
 create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);

modules/flowable-task-service/src/main/resources/org/flowable/task/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.sql

-alter table ACT_RU_TASK add column SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ nvarchar(255);
+alter table ACT_RU_TASK add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_TASK add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_TASK add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_TASK add SCOPE_DEFINITION_ID_ nvarchar(255);
 
 create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
 create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);