Merge remote-tracking branch 'upstream/main' into flowable-release-8.1.0

filiphr · filiphr · commit 27c801b7ae3e · 2026-04-29T16:48:14.000+02:00
# Conflicts:
#	tooling/archetypes/flowable-archetype-unittest/src/main/resources/archetype-resources/pom.xml
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/CmmnHistoryHelper.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/CmmnHistoryHelper.java
@@ -16,63 +16,24 @@
 import java.util.List;
 
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
-import org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntity;
 import org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntityManager;
 import org.flowable.cmmn.engine.impl.persistence.entity.HistoricMilestoneInstanceEntityManager;
 import org.flowable.cmmn.engine.impl.persistence.entity.HistoricPlanItemInstanceEntityManager;
 import org.flowable.cmmn.engine.impl.task.TaskHelper;
 import org.flowable.common.engine.api.scope.ScopeTypes;
 import org.flowable.common.engine.impl.util.CollectionUtil;
 import org.flowable.identitylink.service.HistoricIdentityLinkService;
-import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntity;
 import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityManager;
 
 /**
  * Contains logic that is shared by multiple classes around history.
- * 
+ *
  * @author Joram Barrez
  */
 public class CmmnHistoryHelper {
-    
-    public static final int MAX_SUB_CASE_INSTANCES = 1000;
-    
-    public static void deleteHistoricCaseInstance(CmmnEngineConfiguration cmmnEngineConfiguration, String caseInstanceId) {
-        HistoricCaseInstanceEntityManager historicCaseInstanceEntityManager = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager();
-        HistoricCaseInstanceEntity historicCaseInstance = historicCaseInstanceEntityManager.findById(caseInstanceId);
-
-        HistoricMilestoneInstanceEntityManager historicMilestoneInstanceEntityManager = cmmnEngineConfiguration.getHistoricMilestoneInstanceEntityManager();
-        historicMilestoneInstanceEntityManager.findHistoricMilestoneInstancesByQueryCriteria(new HistoricMilestoneInstanceQueryImpl().milestoneInstanceCaseInstanceId(historicCaseInstance.getId()))
-                .forEach(m -> historicMilestoneInstanceEntityManager.delete(m.getId()));
-
-        HistoricPlanItemInstanceEntityManager historicPlanItemInstanceEntityManager = cmmnEngineConfiguration.getHistoricPlanItemInstanceEntityManager();
-        historicPlanItemInstanceEntityManager.findByCriteria(new HistoricPlanItemInstanceQueryImpl().planItemInstanceCaseInstanceId(historicCaseInstance.getId()))
-                .forEach(p -> historicPlanItemInstanceEntityManager.delete(p.getId()));
-
-        HistoricIdentityLinkService historicIdentityLinkService = cmmnEngineConfiguration.getIdentityLinkServiceConfiguration().getHistoricIdentityLinkService();
-        historicIdentityLinkService.deleteHistoricIdentityLinksByScopeIdAndScopeType(historicCaseInstance.getId(), ScopeTypes.CMMN);
-        historicIdentityLinkService.deleteHistoricIdentityLinksByScopeIdAndScopeType(historicCaseInstance.getId(), ScopeTypes.PLAN_ITEM);
-        
-        if (cmmnEngineConfiguration.isEnableEntityLinks()) {
-            cmmnEngineConfiguration.getEntityLinkServiceConfiguration().getHistoricEntityLinkService()
-            .deleteHistoricEntityLinksByScopeIdAndScopeType(historicCaseInstance.getId(), ScopeTypes.CMMN);
-        }
-
-        HistoricVariableInstanceEntityManager historicVariableInstanceEntityManager = cmmnEngineConfiguration.getVariableServiceConfiguration().getHistoricVariableInstanceEntityManager();
-        List<HistoricVariableInstanceEntity> historicVariableInstanceEntities = historicVariableInstanceEntityManager
-            .findHistoricalVariableInstancesByScopeIdAndScopeType(caseInstanceId, ScopeTypes.CMMN);
-        for (HistoricVariableInstanceEntity historicVariableInstanceEntity : historicVariableInstanceEntities) {
-            historicVariableInstanceEntityManager.delete(historicVariableInstanceEntity);
-        }
-
-        TaskHelper.deleteHistoricTaskInstancesByCaseInstanceId(caseInstanceId, cmmnEngineConfiguration);
 
-        historicCaseInstanceEntityManager.delete(historicCaseInstance);
+    public static final int MAX_SUB_CASE_INSTANCES = 1000;
 
-        // Also delete any sub cases that may be active
-        historicCaseInstanceEntityManager.createHistoricCaseInstanceQuery().caseInstanceParentId(caseInstanceId).list()
-                .forEach(c -> deleteHistoricCaseInstance(cmmnEngineConfiguration, c.getId()));
-    }
-    
     public static void bulkDeleteHistoricCaseInstances(Collection<String> caseInstanceIds, CmmnEngineConfiguration cmmnEngineConfiguration) {
         HistoricCaseInstanceEntityManager historicCaseInstanceEntityManager = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager();
 
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/DefaultCmmnHistoryManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/history/DefaultCmmnHistoryManager.java
@@ -37,6 +37,7 @@
 import org.flowable.cmmn.model.Stage;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.delegate.Expression;
+import org.flowable.common.engine.api.scope.ScopeTypes;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.entitylink.api.history.HistoricEntityLinkService;
 import org.flowable.entitylink.service.impl.persistence.entity.EntityLinkEntity;
@@ -51,6 +52,8 @@
 import org.flowable.task.service.impl.HistoricTaskInstanceQueryImpl;
 import org.flowable.task.service.impl.persistence.entity.HistoricTaskInstanceEntity;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
+import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntity;
+import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityManager;
 import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity;
 
 /**
@@ -191,9 +194,44 @@ public void recordMilestoneReached(MilestoneInstanceEntity milestoneInstance) {
     @Override
     public void recordHistoricCaseInstanceDeleted(String caseInstanceId, String tenantId) {
         if (getHistoryConfigurationSettings().isHistoryEnabled()) {
-            CmmnHistoryHelper.deleteHistoricCaseInstance(cmmnEngineConfiguration, caseInstanceId);
+            HistoricCaseInstanceEntityManager historicCaseInstanceEntityManager = cmmnEngineConfiguration.getHistoricCaseInstanceEntityManager();
+            HistoricCaseInstanceEntity historicCaseInstance = historicCaseInstanceEntityManager.findById(caseInstanceId);
+
+            HistoricMilestoneInstanceEntityManager historicMilestoneInstanceEntityManager = cmmnEngineConfiguration.getHistoricMilestoneInstanceEntityManager();
+            historicMilestoneInstanceEntityManager.findHistoricMilestoneInstancesByQueryCriteria(
+                    new HistoricMilestoneInstanceQueryImpl().milestoneInstanceCaseInstanceId(historicCaseInstance.getId()))
+                    .forEach(m -> historicMilestoneInstanceEntityManager.delete(m.getId()));
+
+            HistoricPlanItemInstanceEntityManager historicPlanItemInstanceEntityManager = cmmnEngineConfiguration.getHistoricPlanItemInstanceEntityManager();
+            historicPlanItemInstanceEntityManager.findByCriteria(
+                    new HistoricPlanItemInstanceQueryImpl().planItemInstanceCaseInstanceId(historicCaseInstance.getId()))
+                    .forEach(p -> historicPlanItemInstanceEntityManager.delete(p.getId()));
+
+            HistoricIdentityLinkService historicIdentityLinkService = cmmnEngineConfiguration.getIdentityLinkServiceConfiguration().getHistoricIdentityLinkService();
+            historicIdentityLinkService.deleteHistoricIdentityLinksByScopeIdAndScopeType(historicCaseInstance.getId(), ScopeTypes.CMMN);
+            historicIdentityLinkService.deleteHistoricIdentityLinksByScopeIdAndScopeType(historicCaseInstance.getId(), ScopeTypes.PLAN_ITEM);
+
+            if (cmmnEngineConfiguration.isEnableEntityLinks()) {
+                cmmnEngineConfiguration.getEntityLinkServiceConfiguration().getHistoricEntityLinkService()
+                        .deleteHistoricEntityLinksByScopeIdAndScopeType(historicCaseInstance.getId(), ScopeTypes.CMMN);
+            }
+
+            HistoricVariableInstanceEntityManager historicVariableInstanceEntityManager = cmmnEngineConfiguration.getVariableServiceConfiguration().getHistoricVariableInstanceEntityManager();
+            List<HistoricVariableInstanceEntity> historicVariableInstanceEntities = historicVariableInstanceEntityManager
+                    .findHistoricalVariableInstancesByScopeIdAndScopeType(caseInstanceId, ScopeTypes.CMMN);
+            for (HistoricVariableInstanceEntity historicVariableInstanceEntity : historicVariableInstanceEntities) {
+                historicVariableInstanceEntityManager.delete(historicVariableInstanceEntity);
+            }
+
+            TaskHelper.deleteHistoricTaskInstancesByCaseInstanceId(caseInstanceId, cmmnEngineConfiguration);
+
+            historicCaseInstanceEntityManager.delete(historicCaseInstance);
+
+            // Also delete any sub cases that may be active
+            historicCaseInstanceEntityManager.createHistoricCaseInstanceQuery().caseInstanceParentId(caseInstanceId).list()
+                    .forEach(c -> recordHistoricCaseInstanceDeleted(c.getId(), c.getTenantId()));
         }
-    } 
+    }
 
     @Override
     public void recordBulkDeleteHistoricCaseInstances(Collection<String> caseInstanceIds) {
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/CaseDefinitionEntityManagerImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/CaseDefinitionEntityManagerImpl.java
@@ -21,7 +21,6 @@
 import org.flowable.cmmn.api.repository.CaseDefinitionQuery;
 import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
-import org.flowable.cmmn.engine.impl.history.CmmnHistoryHelper;
 import org.flowable.cmmn.engine.impl.history.HistoricCaseInstanceQueryImpl;
 import org.flowable.cmmn.engine.impl.history.HistoricMilestoneInstanceQueryImpl;
 import org.flowable.cmmn.engine.impl.persistence.entity.data.CaseDefinitionDataManager;
@@ -131,7 +130,8 @@ public void deleteCaseDefinitionAndRelatedData(String caseDefinitionId, boolean
             List<HistoricCaseInstance> historicCaseInstanceEntities = historicCaseInstanceEntityManager
                     .findByCriteria(new HistoricCaseInstanceQueryImpl().caseDefinitionId(caseDefinitionId));
             for (HistoricCaseInstance historicCaseInstanceEntity : historicCaseInstanceEntities) {
-                CmmnHistoryHelper.deleteHistoricCaseInstance(engineConfiguration, historicCaseInstanceEntity.getId());
+                engineConfiguration.getCmmnHistoryManager()
+                        .recordHistoricCaseInstanceDeleted(historicCaseInstanceEntity.getId(), historicCaseInstanceEntity.getTenantId());
             }
         }
         
diff --git a/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/RabbitChannelDefinitionProcessorTest.java b/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/RabbitChannelDefinitionProcessorTest.java
@@ -544,7 +544,7 @@ void eventWithMultipleHeaders() {
     void eventShouldBeSendAfterOutboundChannelDefinitionIsRegisteredWithDefinedExchange() {
         TopicExchange exchange = new TopicExchange("flowable-test");
         rabbitAdmin.declareExchange(exchange);
-        Queue queue = new Queue("outbound-customer", false);
+        Queue queue = new Queue("outbound-customer", true);
         rabbitAdmin.declareQueue(queue);
         Binding binding = BindingBuilder.bind(queue).to(exchange).with("customer");
         rabbitAdmin.declareBinding(binding);
@@ -857,7 +857,7 @@ void rabbitOutboundChannelShouldResolveRoutingKeyFromExpressionUsingCustomBean()
     void rabbitOutboundChannelShouldResolveExchangeFromExpression() {
         TopicExchange exchange = new TopicExchange("test-expression-customer");
         rabbitAdmin.declareExchange(exchange);
-        Queue queue = new Queue("outbound-customer", false);
+        Queue queue = new Queue("outbound-customer", true);
         rabbitAdmin.declareQueue(queue);
         queuesToDelete.add("outbound-customer");
         Binding binding = BindingBuilder.bind(queue).to(exchange).with("customer");
diff --git a/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/RabbitChannelRebootEngineTest.java b/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/rabbit/RabbitChannelRebootEngineTest.java
@@ -206,12 +206,12 @@ public void destroy() throws Exception {
 
         @Bean
         public Queue testListenerQueue() {
-            return new Queue("testListener", false);
+            return new Queue("testListener", true);
         }
 
         @Bean
         public Queue testCustomerQueue() {
-            return new Queue("test-customer", false);
+            return new Queue("test-customer", true);
         }
 
         @RabbitListener(queues = "testListener")
diff --git a/tooling/archetypes/flowable-archetype-unittest/pom.xml b/tooling/archetypes/flowable-archetype-unittest/pom.xml
@@ -12,5 +12,35 @@
   <name>Flowable - Archetype Unit Test</name>
   <artifactId>flowable-archetype-unittest</artifactId>
   <description>Creates a new Flowable unit test.</description>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>archetype-resources/pom.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>archetype-resources/pom.xml</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <configuration>
+          <delimiters>
+            <delimiter>@</delimiter>
+          </delimiters>
+          <useDefaultDelimiters>false</useDefaultDelimiters>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/tooling/archetypes/flowable-archetype-unittest/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/flowable-archetype-unittest/src/main/resources/archetype-resources/pom.xml
@@ -10,30 +10,30 @@
 		<dependency>
 			<groupId>org.flowable</groupId>
 			<artifactId>flowable-engine</artifactId>
-			<version>8.1.0.13</version>
+			<version>@project.version@</version>
 		</dependency>
 		<dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.13.4</version>
+            <version>@junit.jupiter.version@</version>
             <scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.27.4</version>
+			<version>@assertj.version@</version>
             <scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>2.3.232</version>
+			<version>@h2.version@</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-reload4j</artifactId>
-			<version>2.0.17</version>
+			<version>@slf4j.version@</version>
 		</dependency>
 	</dependencies>
 

Original file line number	Diff line number	Diff line change
`@@ -206,12 +206,12 @@ public void destroy() throws Exception {`
`206`	`206`
`207`	`207`	`@Bean`
`208`	`208`	`public Queue testListenerQueue() {`
`209`		`- return new Queue("testListener", false);`
	`209`	`+ return new Queue("testListener", true);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`@Bean`
`213`	`213`	`public Queue testCustomerQueue() {`
`214`		`- return new Queue("test-customer", false);`
	`214`	`+ return new Queue("test-customer", true);`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`@RabbitListener(queues = "testListener")`