diff --git a/datapool/datapool-api/pom.xml b/datapool/datapool-api/pom.xml
index 006607ddb..6c48b9575 100755
--- a/datapool/datapool-api/pom.xml
+++ b/datapool/datapool-api/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-datapool-root
- 2.1.0
+ 2.1.1
camunda-bpm-datapool-api
diff --git a/datapool/datapool-core/pom.xml b/datapool/datapool-core/pom.xml
index 0b6d35852..52bb7e474 100755
--- a/datapool/datapool-core/pom.xml
+++ b/datapool/datapool-core/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-datapool-root
- 2.1.0
+ 2.1.1
camunda-bpm-datapool-core
diff --git a/datapool/datapool-event/pom.xml b/datapool/datapool-event/pom.xml
index 208ee16f7..4f1189a6c 100755
--- a/datapool/datapool-event/pom.xml
+++ b/datapool/datapool-event/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-datapool-root
- 2.1.0
+ 2.1.1
camunda-bpm-datapool-event
diff --git a/datapool/pom.xml b/datapool/pom.xml
index 7376a43c2..71b40a2dd 100755
--- a/datapool/pom.xml
+++ b/datapool/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
camunda-bpm-datapool-root
diff --git a/docs/pom.xml b/docs/pom.xml
index 1f24462ed..02d0dac3b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-docs
diff --git a/docs/src/orchid/resources/changelog/2.1/2.1.1.ad b/docs/src/orchid/resources/changelog/2.1/2.1.1.ad
new file mode 100644
index 000000000..88d6c8eb7
--- /dev/null
+++ b/docs/src/orchid/resources/changelog/2.1/2.1.1.ad
@@ -0,0 +1,11 @@
+---
+version: 2.1.1
+---
+
+== Features
+
+* Process instance reporting can be switched off by the property: `task.collector.process-instance`, see #274
+
+== Breaking Changes
+
+* Renamed property of task collector for process definition from `task.collector.process` to `task.collector.process-definition`
diff --git a/docs/src/orchid/resources/wiki/user-guide/components/engine-taskpool-collector.ad b/docs/src/orchid/resources/wiki/user-guide/components/engine-taskpool-collector.ad
index f752ceba8..e588b524a 100644
--- a/docs/src/orchid/resources/wiki/user-guide/components/engine-taskpool-collector.ad
+++ b/docs/src/orchid/resources/wiki/user-guide/components/engine-taskpool-collector.ad
@@ -283,8 +283,8 @@ to console (success is logged in `DEBUG` log level, errors are using `ERROR` log
In some situations it is required to take care of command outcome. A prominent example is to include a metric for command dispatching errors into monitoring. For doing so,
it is possible to provide own handlers for success and error command outcome.
-For the Task Command Sender (as a part of `Taskpool Collector`) please provide a Spring Bean implementing the `io.holunda.camunda.taskpool.sender.gateway.TaskCommandSuccessHandler`
-and `io.holunda.camunda.taskpool.sender.gateway.TaskCommandErrorHandler` accordingly.
+For the Task Command Sender (as a part of `Taskpool Collector`) please provide a Spring Bean implementing the `CommandSuccessHandler`
+and `CommandErrorHandler` accordingly.
[source, kotlin]
diff --git a/engine/camunda-engine-client/pom.xml b/engine/camunda-engine-client/pom.xml
index 83f755a03..a099e394b 100644
--- a/engine/camunda-engine-client/pom.xml
+++ b/engine/camunda-engine-client/pom.xml
@@ -4,7 +4,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-engine-root
- 2.1.0
+ 2.1.1
camunda-bpm-engine-client
diff --git a/engine/datapool-collector/pom.xml b/engine/datapool-collector/pom.xml
index f8441c6d4..f847ef532 100755
--- a/engine/datapool-collector/pom.xml
+++ b/engine/datapool-collector/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-engine-root
- 2.1.0
+ 2.1.1
camunda-bpm-datapool-collector
diff --git a/engine/pom.xml b/engine/pom.xml
index a9aa0c7d1..5c2c39a43 100755
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-engine-root
diff --git a/engine/property-taskurl-resolver/pom.xml b/engine/property-taskurl-resolver/pom.xml
index 8b2ef9056..8fe7d2c1a 100644
--- a/engine/property-taskurl-resolver/pom.xml
+++ b/engine/property-taskurl-resolver/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-engine-root
- 2.1.0
+ 2.1.1
taskpool-property-taskurl-resolver
diff --git a/engine/taskpool-collector/pom.xml b/engine/taskpool-collector/pom.xml
index 0016717ce..9007a941a 100755
--- a/engine/taskpool-collector/pom.xml
+++ b/engine/taskpool-collector/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-engine-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-collector
diff --git a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorConfiguration.kt b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorConfiguration.kt
index cc4323de9..cfe02ed82 100755
--- a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorConfiguration.kt
+++ b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorConfiguration.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import io.holunda.camunda.taskpool.enricher.*
import io.holunda.camunda.taskpool.sender.CommandSender
-import io.holunda.camunda.taskpool.sender.TxAwareAccumulatingCommandSender
+import io.holunda.camunda.taskpool.sender.TxAwareAccumulatingEngineTaskCommandSender
import io.holunda.camunda.taskpool.sender.accumulator.CommandAccumulator
import io.holunda.camunda.taskpool.sender.accumulator.ProjectingCommandAccumulator
import io.holunda.camunda.taskpool.sender.gateway.*
@@ -65,7 +65,7 @@ class TaskCollectorConfiguration(
@ConditionalOnExpression("'\${camunda.taskpool.collector.sender.type}' != 'custom'")
fun txCommandSender(commandListGateway: CommandListGateway, accumulator: CommandAccumulator): CommandSender =
when (properties.sender.type) {
- TaskSenderType.tx -> TxAwareAccumulatingCommandSender(commandListGateway, accumulator, properties.sender.sendWithinTransaction)
+ TaskSenderType.tx -> TxAwareAccumulatingEngineTaskCommandSender(commandListGateway, accumulator, properties.sender.sendWithinTransaction)
else -> throw IllegalStateException("Could not initialize sender, used ${properties.sender.type} type.")
}
@@ -97,12 +97,12 @@ class TaskCollectorConfiguration(
* Default logging handler.
*/
@Bean
- fun loggingTaskCommandSuccessHandler(): TaskCommandSuccessHandler = LoggingTaskCommandSuccessHandler(LoggerFactory.getLogger(CommandSender::class.java))
+ fun loggingTaskCommandSuccessHandler(): CommandSuccessHandler = LoggingTaskCommandSuccessHandler(LoggerFactory.getLogger(CommandSender::class.java))
/**
* Default logging handler.
*/
@Bean
- fun loggingTaskCommandErrorHandler(): TaskCommandErrorHandler = LoggingTaskCommandErrorHandler(LoggerFactory.getLogger(CommandSender::class.java))
+ fun loggingTaskCommandErrorHandler(): CommandErrorHandler = LoggingTaskCommandErrorHandler(LoggerFactory.getLogger(CommandSender::class.java))
}
diff --git a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/collector/process/definition/ProcessDefinitionEnginePlugin.kt b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/collector/process/definition/ProcessDefinitionEnginePlugin.kt
index 68ba23b22..479a9157a 100644
--- a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/collector/process/definition/ProcessDefinitionEnginePlugin.kt
+++ b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/collector/process/definition/ProcessDefinitionEnginePlugin.kt
@@ -15,7 +15,7 @@ class ProcessDefinitionEnginePlugin(
private val logger: Logger = LoggerFactory.getLogger(ProcessDefinitionEnginePlugin::class.java)
override fun preInit(springConfiguration: SpringProcessEngineConfiguration) {
- if (properties.process.enabled) {
+ if (properties.processDefintion.enabled) {
logger.info("EVENTING-010: Process definition registration plugin registered.")
springConfiguration.customPostBPMNParseListeners.add(
RegisterProcessDefinitionParseListener(springConfiguration)
diff --git a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/enricher/ProcessInstanceEnricherService.kt b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/enricher/ProcessInstanceEnricherService.kt
index e0ac63b94..9756d16c3 100644
--- a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/enricher/ProcessInstanceEnricherService.kt
+++ b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/enricher/ProcessInstanceEnricherService.kt
@@ -1,5 +1,6 @@
package io.holunda.camunda.taskpool.enricher
+import io.holunda.camunda.taskpool.TaskCollectorProperties
import io.holunda.camunda.taskpool.api.process.instance.ProcessInstanceCommand
import io.holunda.camunda.taskpool.sender.gateway.CommandListGateway
import mu.KLogging
@@ -11,7 +12,8 @@ import org.springframework.stereotype.Component
*/
@Component
class ProcessInstanceEnricherService(
- private val commandListGateway: CommandListGateway
+ private val commandListGateway: CommandListGateway,
+ private val properties: TaskCollectorProperties
) {
companion object : KLogging()
@@ -21,6 +23,11 @@ class ProcessInstanceEnricherService(
*/
@EventListener
fun handle(command: ProcessInstanceCommand) {
- commandListGateway.sendToGateway(listOf(command))
+ if (properties.processInstance.enabled) {
+ commandListGateway.sendToGateway(listOf(command))
+ logger.debug { "Sending update about process instance ${command.processInstanceId}." }
+ } else {
+ logger.debug { "Process instance collecting has been disabled by property, skipping ${command.processInstanceId}." }
+ }
}
}
diff --git a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/TxAwareAccumulatingCommandSender.kt b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/TxAwareAccumulatingEngineTaskCommandSender.kt
similarity index 98%
rename from engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/TxAwareAccumulatingCommandSender.kt
rename to engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/TxAwareAccumulatingEngineTaskCommandSender.kt
index 1b8382030..d374df896 100644
--- a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/TxAwareAccumulatingCommandSender.kt
+++ b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/TxAwareAccumulatingEngineTaskCommandSender.kt
@@ -11,7 +11,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
/**
* Collects commands of one transaction, accumulates them to one command and sends it after TX commit.
*/
-open class TxAwareAccumulatingCommandSender(
+open class TxAwareAccumulatingEngineTaskCommandSender(
private val commandListGateway: CommandListGateway,
private val commandAccumulator: CommandAccumulator,
private val sendTasksWithinTransaction: Boolean
diff --git a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/AxonCommandListGateway.kt b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/AxonCommandListGateway.kt
index 328bc30db..3a7adc07d 100644
--- a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/AxonCommandListGateway.kt
+++ b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/AxonCommandListGateway.kt
@@ -15,8 +15,8 @@ import org.springframework.stereotype.Component
class AxonCommandListGateway(
private val commandGateway: CommandGateway,
private val properties: TaskCollectorProperties,
- private val taskCommandSuccessHandler: TaskCommandSuccessHandler,
- private val taskCommandErrorHandler: TaskCommandErrorHandler
+ private val commandSuccessHandler: CommandSuccessHandler,
+ private val commandErrorHandler: CommandErrorHandler
) : CommandListGateway {
private val logger: Logger = LoggerFactory.getLogger(CommandSender::class.java)
@@ -33,9 +33,9 @@ class AxonCommandListGateway(
if (properties.sender.enabled) {
commandGateway.send(nextCommand) { commandMessage, commandResultMessage ->
if (commandResultMessage.isExceptional) {
- taskCommandErrorHandler.apply(commandMessage, commandResultMessage)
+ commandErrorHandler.apply(commandMessage, commandResultMessage)
} else {
- taskCommandSuccessHandler.apply(commandMessage, commandResultMessage)
+ commandSuccessHandler.apply(commandMessage, commandResultMessage)
}
sendToGateway(remainingCommands)
}
@@ -51,7 +51,7 @@ class AxonCommandListGateway(
/**
* Error handler, logging the error.
*/
-open class LoggingTaskCommandErrorHandler(private val logger: Logger) : TaskCommandErrorHandler {
+open class LoggingTaskCommandErrorHandler(private val logger: Logger) : CommandErrorHandler {
override fun apply(commandMessage: Any, commandResultMessage: CommandResultMessage) {
logger.error("SENDER-006: Sending command $commandMessage resulted in error", commandResultMessage.exceptionResult())
@@ -61,7 +61,7 @@ open class LoggingTaskCommandErrorHandler(private val logger: Logger) : TaskComm
/**
* Logs success.
*/
-open class LoggingTaskCommandSuccessHandler(private val logger: Logger) : TaskCommandSuccessHandler {
+open class LoggingTaskCommandSuccessHandler(private val logger: Logger) : CommandSuccessHandler {
override fun apply(commandMessage: Any, commandResultMessage: CommandResultMessage) {
if (logger.isDebugEnabled) {
diff --git a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/CommandListGateway.kt b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/CommandListGateway.kt
index 1a439d58d..116452117 100644
--- a/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/CommandListGateway.kt
+++ b/engine/taskpool-collector/src/main/kotlin/io/holunda/camunda/taskpool/sender/gateway/CommandListGateway.kt
@@ -18,9 +18,9 @@ interface CommandListGateway {
/**
* Handler for command errors.
*/
-interface TaskCommandErrorHandler : BiFunction, Unit>
+interface CommandErrorHandler : BiFunction, Unit>
/**
* Handler for command results.
*/
-interface TaskCommandSuccessHandler : BiFunction, Unit>
+interface CommandSuccessHandler : BiFunction, Unit>
diff --git a/engine/taskpool-collector/src/test/kotlin/io/holunda/camunda/taskpool/sender/AxonCommandListGatewayTest.kt b/engine/taskpool-collector/src/test/kotlin/io/holunda/camunda/taskpool/sender/AxonCommandListGatewayTest.kt
index b3821de5d..ab1f02b4e 100644
--- a/engine/taskpool-collector/src/test/kotlin/io/holunda/camunda/taskpool/sender/AxonCommandListGatewayTest.kt
+++ b/engine/taskpool-collector/src/test/kotlin/io/holunda/camunda/taskpool/sender/AxonCommandListGatewayTest.kt
@@ -44,8 +44,8 @@ class AxonCommandListGatewayTest {
enabled = false
)
),
- taskCommandErrorHandler = LoggingTaskCommandErrorHandler(logger),
- taskCommandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
+ commandErrorHandler = LoggingTaskCommandErrorHandler(logger),
+ commandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
)
wrapper.sendToGateway(listOf(makeCreateTaskCommand()))
@@ -63,8 +63,8 @@ class AxonCommandListGatewayTest {
enabled = true
)
),
- taskCommandErrorHandler = LoggingTaskCommandErrorHandler(logger),
- taskCommandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
+ commandErrorHandler = LoggingTaskCommandErrorHandler(logger),
+ commandSuccessHandler = LoggingTaskCommandSuccessHandler(logger)
)
val createTaskCommand = makeCreateTaskCommand()
diff --git a/engine/taskpool-engine-springboot-starter/pom.xml b/engine/taskpool-engine-springboot-starter/pom.xml
index 39ffb58f5..40d12e32f 100755
--- a/engine/taskpool-engine-springboot-starter/pom.xml
+++ b/engine/taskpool-engine-springboot-starter/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-engine-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-engine-springboot-starter
diff --git a/engine/variable-serializer/pom.xml b/engine/variable-serializer/pom.xml
index 2924d8b72..9e42dcd00 100755
--- a/engine/variable-serializer/pom.xml
+++ b/engine/variable-serializer/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-engine-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-variable-serializer
diff --git a/examples/components/process-backend/pom.xml b/examples/components/process-backend/pom.xml
index 52cbc7226..874cc5422 100755
--- a/examples/components/process-backend/pom.xml
+++ b/examples/components/process-backend/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/components/process-backend/src/main/kotlin/io/holunda/camunda/taskpool/example/process/RequestApprovalProcessConfiguration.kt b/examples/components/process-backend/src/main/kotlin/io/holunda/camunda/taskpool/example/process/RequestApprovalProcessConfiguration.kt
index c90be04fd..00fdb3a5d 100644
--- a/examples/components/process-backend/src/main/kotlin/io/holunda/camunda/taskpool/example/process/RequestApprovalProcessConfiguration.kt
+++ b/examples/components/process-backend/src/main/kotlin/io/holunda/camunda/taskpool/example/process/RequestApprovalProcessConfiguration.kt
@@ -11,7 +11,7 @@ import io.holunda.camunda.taskpool.example.process.process.RequestApprovalProces
import io.holunda.camunda.taskpool.example.process.process.RequestApprovalProcess.Variables.ORIGINATOR
import io.holunda.camunda.taskpool.example.process.process.RequestApprovalProcess.Variables.REQUEST_ID
import io.holunda.camunda.taskpool.sender.gateway.LoggingTaskCommandErrorHandler
-import io.holunda.camunda.taskpool.sender.gateway.TaskCommandErrorHandler
+import io.holunda.camunda.taskpool.sender.gateway.CommandErrorHandler
import mu.KLogging
import org.axonframework.commandhandling.CommandResultMessage
import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication
@@ -92,7 +92,7 @@ class RequestApprovalProcessConfiguration {
@Bean
@Primary
- fun myTaskCommandErrorHandler(): TaskCommandErrorHandler = object : LoggingTaskCommandErrorHandler(logger) {
+ fun myTaskCommandErrorHandler(): CommandErrorHandler = object : LoggingTaskCommandErrorHandler(logger) {
override fun apply(commandMessage: Any, commandResultMessage: CommandResultMessage) {
logger.error { "<--------- CUSTOM ERROR HANDLER REPORT --------->" }
super.apply(commandMessage, commandResultMessage)
diff --git a/examples/components/process-forms/pom.xml b/examples/components/process-forms/pom.xml
index d570c7aad..de26fcc19 100755
--- a/examples/components/process-forms/pom.xml
+++ b/examples/components/process-forms/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/components/tasklist-angular/pom.xml b/examples/components/tasklist-angular/pom.xml
index 5fd3821c8..01254dec5 100755
--- a/examples/components/tasklist-angular/pom.xml
+++ b/examples/components/tasklist-angular/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/components/tasklist-api/pom.xml b/examples/components/tasklist-api/pom.xml
index bd519a910..36379e53a 100755
--- a/examples/components/tasklist-api/pom.xml
+++ b/examples/components/tasklist-api/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/components/tasklist-backend/pom.xml b/examples/components/tasklist-backend/pom.xml
index 412b41ea6..d0a2a9e2c 100755
--- a/examples/components/tasklist-backend/pom.xml
+++ b/examples/components/tasklist-backend/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/components/tasklist-reactive-backend/pom.xml b/examples/components/tasklist-reactive-backend/pom.xml
index ebc7583e7..a9bd95f7c 100755
--- a/examples/components/tasklist-reactive-backend/pom.xml
+++ b/examples/components/tasklist-reactive-backend/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/components/users/pom.xml b/examples/components/users/pom.xml
index f033e71ae..540e98075 100644
--- a/examples/components/users/pom.xml
+++ b/examples/components/users/pom.xml
@@ -7,7 +7,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
../../pom.xml
diff --git a/examples/pom.xml b/examples/pom.xml
index 29bf9bf45..e45b2c998 100755
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
taskpool-examples-root
diff --git a/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml b/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml
index 695f8c980..ef709c39f 100755
--- a/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml
+++ b/examples/scenarios/distributed-axon-server/camunda-webapp-application/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-scenario-distributed-axon-server
- 2.1.0
+ 2.1.1
example-distributed-axon-server-webapp-application
diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml
index 385bf7ee6..7d9e94641 100755
--- a/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml
+++ b/examples/scenarios/distributed-axon-server/cockpit-application/application/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-cockpit-root
- 2.1.0
+ 2.1.1
taskpool-example-cockpit
diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
index 6f7230cd1..b094ab25b 100755
--- a/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
+++ b/examples/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-cockpit-root
- 2.1.0
+ 2.1.1
taskpool-example-cockpit-backend
diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml
index 146c39e8c..183bd452e 100755
--- a/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml
+++ b/examples/scenarios/distributed-axon-server/cockpit-application/frontend/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-cockpit-root
- 2.1.0
+ 2.1.1
taskpool-example-cockpit-frontend
diff --git a/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml b/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml
index 8861c7b31..daded42de 100755
--- a/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml
+++ b/examples/scenarios/distributed-axon-server/cockpit-application/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-scenario-distributed-axon-server
- 2.1.0
+ 2.1.1
taskpool-example-cockpit-root
diff --git a/examples/scenarios/distributed-axon-server/pom.xml b/examples/scenarios/distributed-axon-server/pom.xml
index 610e50584..afc2f72ab 100755
--- a/examples/scenarios/distributed-axon-server/pom.xml
+++ b/examples/scenarios/distributed-axon-server/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-scenario-root
- 2.1.0
+ 2.1.1
taskpool-example-scenario-distributed-axon-server
diff --git a/examples/scenarios/distributed-axon-server/process-application/pom.xml b/examples/scenarios/distributed-axon-server/process-application/pom.xml
index 088ddfbdf..ec8bb1f7c 100755
--- a/examples/scenarios/distributed-axon-server/process-application/pom.xml
+++ b/examples/scenarios/distributed-axon-server/process-application/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-scenario-distributed-axon-server
- 2.1.0
+ 2.1.1
example-distributed-axon-server-process-application
diff --git a/examples/scenarios/distributed-axon-server/process-application/src/main/resources/application.yml b/examples/scenarios/distributed-axon-server/process-application/src/main/resources/application.yml
index 9498f223b..65147d2d6 100644
--- a/examples/scenarios/distributed-axon-server/process-application/src/main/resources/application.yml
+++ b/examples/scenarios/distributed-axon-server/process-application/src/main/resources/application.yml
@@ -44,7 +44,9 @@ camunda:
default-query-timeout: 3
collector:
tasklist-url: http://localhost:8081/taskpool/
- process:
+ process-definition:
+ enabled: true
+ process-instance:
enabled: true
enricher:
application-name: ${spring.application.name} # default
diff --git a/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml b/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml
index 757bd3359..79400b2b7 100755
--- a/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml
+++ b/examples/scenarios/distributed-axon-server/taskpool-application/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-scenario-distributed-axon-server
- 2.1.0
+ 2.1.1
example-distributed-axon-server-taskpool-application
diff --git a/examples/scenarios/pom.xml b/examples/scenarios/pom.xml
index 454f14ab2..8dae40bdf 100755
--- a/examples/scenarios/pom.xml
+++ b/examples/scenarios/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-examples-root
- 2.1.0
+ 2.1.1
taskpool-example-scenario-root
diff --git a/examples/scenarios/single-node/pom.xml b/examples/scenarios/single-node/pom.xml
index e034818eb..5ebdde82a 100755
--- a/examples/scenarios/single-node/pom.xml
+++ b/examples/scenarios/single-node/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
taskpool-example-scenario-root
- 2.1.0
+ 2.1.1
taskpool-example-scenario-single-node
diff --git a/examples/scenarios/single-node/src/main/resources/application.yml b/examples/scenarios/single-node/src/main/resources/application.yml
index 756013243..b3bd1e3c7 100755
--- a/examples/scenarios/single-node/src/main/resources/application.yml
+++ b/examples/scenarios/single-node/src/main/resources/application.yml
@@ -39,7 +39,9 @@ camunda:
taskpool:
collector:
tasklist-url: http://localhost:${server.port}/taskpool/tasks
- process:
+ process-instance:
+ enabled: true
+ process-definition:
enabled: true
enricher:
application-name: ${spring.application.name} # default
diff --git a/pom.xml b/pom.xml
index 3db2b1cc8..c14a67534 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
pom
${project.artifactId}
diff --git a/taskpool/pom.xml b/taskpool/pom.xml
index 272c52a25..8979bee61 100755
--- a/taskpool/pom.xml
+++ b/taskpool/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-root
diff --git a/taskpool/taskpool-api/pom.xml b/taskpool/taskpool-api/pom.xml
index 878b79389..a3128c63b 100755
--- a/taskpool/taskpool-api/pom.xml
+++ b/taskpool/taskpool-api/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-api
diff --git a/taskpool/taskpool-api/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorProperties.kt b/taskpool/taskpool-api/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorProperties.kt
index 4834e210f..bd2668922 100755
--- a/taskpool/taskpool-api/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorProperties.kt
+++ b/taskpool/taskpool-api/src/main/kotlin/io/holunda/camunda/taskpool/TaskCollectorProperties.kt
@@ -34,7 +34,13 @@ class TaskCollectorProperties(
* Process definition collection properties.
*/
@NestedConfigurationProperty
- var process: ProcessDefinitionProperties = ProcessDefinitionProperties()
+ var processDefintion: ProcessDefinitionProperties = ProcessDefinitionProperties(),
+
+ /**
+ * Process instance collection properties.
+ */
+ @NestedConfigurationProperty
+ var processInstance: ProcessInstanceProperties = ProcessInstanceProperties()
)
/**
@@ -116,3 +122,15 @@ data class ProcessDefinitionProperties(
var enabled: Boolean = false
)
+
+/**
+ * Properties controlling the transfer of process instance.
+ */
+@ConstructorBinding
+data class ProcessInstanceProperties(
+
+ /**
+ * Disable by default.
+ */
+ var enabled: Boolean = false
+)
diff --git a/taskpool/taskpool-core/pom.xml b/taskpool/taskpool-core/pom.xml
index c74bc5d21..b42a1141d 100755
--- a/taskpool/taskpool-core/pom.xml
+++ b/taskpool/taskpool-core/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-core
diff --git a/taskpool/taskpool-event/pom.xml b/taskpool/taskpool-event/pom.xml
index 82811db1c..646676406 100755
--- a/taskpool/taskpool-event/pom.xml
+++ b/taskpool/taskpool-event/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-event
diff --git a/view/mongo/pom.xml b/view/mongo/pom.xml
index f6a37a6f8..90ccfde97 100755
--- a/view/mongo/pom.xml
+++ b/view/mongo/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-view-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-view-mongo
diff --git a/view/pom.xml b/view/pom.xml
index 93dc676f1..4d5c49708 100755
--- a/view/pom.xml
+++ b/view/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-view-root
diff --git a/view/simple/pom.xml b/view/simple/pom.xml
index dfacc163c..a25af1c2d 100755
--- a/view/simple/pom.xml
+++ b/view/simple/pom.xml
@@ -5,7 +5,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-view-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-view-simple
diff --git a/view/view-api/pom.xml b/view/view-api/pom.xml
index 4cb6ab90d..5751eec52 100755
--- a/view/view-api/pom.xml
+++ b/view/view-api/pom.xml
@@ -6,7 +6,7 @@
io.holunda.taskpool
camunda-bpm-taskpool-view-root
- 2.1.0
+ 2.1.1
camunda-bpm-taskpool-view-api