chore(merge): release-10.2.0 into dev

bonitasoft · Sep 24, 2024 · 16bf420 · 16bf420
2 parents 5d64b05 + 79b32a5
commit 16bf420
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...a-process-engine/src/main/java/org/bonitasoft/engine/service/impl/SpringBeanAccessor.java b/...a-process-engine/src/main/java/org/bonitasoft/engine/service/impl/SpringBeanAccessor.java
@@ -18,7 +18,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
 
 import lombok.extern.slf4j.Slf4j;
 import org.bonitasoft.engine.exception.BonitaRuntimeException;
@@ -45,6 +49,9 @@ public class SpringBeanAccessor {
     private static final String WORK_CORE_POOL_SIZE = "bonita.tenant.work.corePoolSize";
     private static final String WORK_MAX_POOL_SIZE = "bonita.tenant.work.maximumPoolSize";
     private static final String WORK_KEEP_ALIVE_IN_SECONDS = "bonita.tenant.work.keepAliveTimeSeconds";
+    private static final String WORK_SQLSERVER_DELAY_ON_MULTIPLE_XA_RESOURCE = "bonita.tenant.work.sqlserver.delayOnMultipleXAResource";
+    private static final String WORK_MYSQL_DELAY_ON_MULTIPLE_XA_RESOURCE = "bonita.tenant.work.mysql.delayOnMultipleXAResource";
+    private static final String WORK_ORACLE_DELAY_ON_MULTIPLE_XA_RESOURCE = "bonita.tenant.work.oracle.delayOnMultipleXAResource";
     private static final String CONNECTOR_CORE_POOL_SIZE = "bonita.tenant.connector.corePoolSize";
     private static final String CONNECTOR_MAX_POOL_SIZE = "bonita.tenant.connector.maximumPoolSize";
     private static final String CONNECTOR_KEEP_ALIVE_IN_SECONDS = "bonita.tenant.connector.keepAliveTimeSeconds";
@@ -120,6 +127,9 @@ protected void warnDeprecatedProperties(MutablePropertySources propertySources)
         warnIfPropertyIsDeprecated(propertySources, WORK_CORE_POOL_SIZE);
         warnIfPropertyIsDeprecated(propertySources, WORK_MAX_POOL_SIZE);
         warnIfPropertyIsDeprecated(propertySources, WORK_KEEP_ALIVE_IN_SECONDS);
+        warnIfPropertyIsDeprecated(propertySources, WORK_SQLSERVER_DELAY_ON_MULTIPLE_XA_RESOURCE);
+        warnIfPropertyIsDeprecated(propertySources, WORK_MYSQL_DELAY_ON_MULTIPLE_XA_RESOURCE);
+        warnIfPropertyIsDeprecated(propertySources, WORK_ORACLE_DELAY_ON_MULTIPLE_XA_RESOURCE);
         warnIfPropertyIsDeprecated(propertySources, CONNECTOR_CORE_POOL_SIZE);
         warnIfPropertyIsDeprecated(propertySources, CONNECTOR_MAX_POOL_SIZE);
         warnIfPropertyIsDeprecated(propertySources, CONNECTOR_KEEP_ALIVE_IN_SECONDS);

diff --git a/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-tenant-community.properties b/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-tenant-community.properties
@@ -31,10 +31,6 @@ bonita.tenant.connector.warnWhenLongerThanMillis=10000
 bonita.tenant.work.terminationTimeout=30
 bonita.tenant.work.queueCapacity=500000
 
-# Add a delay on work when the transaction that registers the work has multiple XA Resources
-# This is an SQL Server specific property to ensure all data commit are visible when the next work is executed.
-bonita.tenant.work.sqlserver.delayOnMultipleXAResource=100
-
 # When a work fails, log only a limited number of frames from the stacktrace
 bonita.tenant.work.exceptionsNumberOfFrameToLog=3