Merge branch 'release/4.1.1'

holunda-io · Jan 15, 2024 · 52c1480 · 52c1480
2 parents dbd931c + fc91328
commit 52c1480
Show file tree

Hide file tree

Showing 41 changed files with 89 additions and 72 deletions.
diff --git a/bom/datapool-dependencies/pom.xml b/bom/datapool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/bom/parent/pom.xml b/bom/parent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-root</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -21,13 +21,13 @@
     <springboot.version>3.1.5</springboot.version>
     <camunda-commons-typed-values.version>7.20.0</camunda-commons-typed-values.version>
 
-    <axon-bom.version>4.9.0</axon-bom.version>
+    <axon-bom.version>4.9.2</axon-bom.version>
     <axon-kotlin.version>4.9.0</axon-kotlin.version>
     <axon-gateway-extension.version>2.0.0</axon-gateway-extension.version>
 
     <awaitility.version>4.2.0</awaitility.version>
-    <mockito-kotlin.version>5.1.0</mockito-kotlin.version>
-    <jgiven.version>1.3.0</jgiven.version>
+    <mockito-kotlin.version>5.2.1</mockito-kotlin.version>
+    <jgiven.version>1.3.1</jgiven.version>
     <jgiven-kotlin.version>1.3.0.0</jgiven-kotlin.version>
 
     <pattern.class.itest>**/*ITest.*</pattern.class.itest>
@@ -372,7 +372,7 @@
           <!-- java compiler -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>3.12.1</version>
           <configuration>
             <encoding>UTF-8</encoding>
             <source>${java.version}</source>
@@ -519,7 +519,7 @@
 
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>3.2.5</version>
           <configuration>
             <useSystemClassLoader>false</useSystemClassLoader>
             <runOrder>random</runOrder>
@@ -540,7 +540,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>3.2.5</version>
           <executions>
             <execution>
               <goals>
@@ -581,7 +581,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.4.0</version>
+          <version>3.5.0</version>
           <executions>
             <execution>
               <phase>generate-sources</phase>

diff --git a/bom/taskpool-dependencies/pom.xml b/bom/taskpool-dependencies/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/bus-jackson/pom.xml b/core/bus-jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/datapool/datapool-api/pom.xml b/core/datapool/datapool-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-datapool-api</artifactId>

diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-datapool-core</artifactId>

diff --git a/core/datapool/datapool-event/pom.xml b/core/datapool/datapool-event/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-datapool-event</artifactId>

diff --git a/core/datapool/pom.xml b/core/datapool/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/spring-utils/pom.xml b/core/spring-utils/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/taskpool/pom.xml b/core/taskpool/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/taskpool/taskpool-api/pom.xml b/core/taskpool/taskpool-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-taskpool-api</artifactId>

diff --git a/core/taskpool/taskpool-core/pom.xml b/core/taskpool/taskpool-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-taskpool-core</artifactId>

diff --git a/core/taskpool/taskpool-event/pom.xml b/core/taskpool/taskpool-event/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-taskpool-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-taskpool-event</artifactId>

diff --git a/docs/developer-guide/contribution.md b/docs/developer-guide/contribution.md
@@ -14,7 +14,7 @@ issue tracking system.
 
 ## Submit a Pull Request
 
-If you found a solution to an [open issue](https://github.com/holuda-io/camunda-bpm-taskpool/issues)
+If you found a solution to an [open issue](https://github.com/holunda-io/camunda-bpm-taskpool/issues)
 and implemented it, we would be happy to add your contribution in the code base. For doing so,
 please create a pull request. Prior to that, please make sure you:
 

diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
@@ -73,26 +73,26 @@ polyflow:
           enabled: true
           enricher:
             type: processVariables
-  sender:
-    enabled: true
-    data-entry:
+    sender:
       enabled: true
-      type: simple
-      application-name: ${spring.application.name}  # default
-    process-definition:
-      enabled: true
-    process-instance:
-      enabled: true
-    process-variable:
-      enabled: true
-    task:
-      enabled: true
-      type: tx
-      send-within-transaction: true # Must be set to true in single node scenario.
-  form-url-resolver:
-      defaultTaskTemplate:  "/tasks/${formKey}/${id}?userId=%userId%"
-      defaultApplicationTemplate: "http://localhost:${server.port}/${applicationName}"
-      defaultProcessTemplate: "/${formKey}?userId=%userId%"
+      data-entry:
+        enabled: true
+        type: simple
+        application-name: ${spring.application.name}  # default
+      process-definition:
+        enabled: true
+      process-instance:
+        enabled: true
+      process-variable:
+        enabled: true
+      task:
+        enabled: true
+        type: tx
+        send-within-transaction: true # Must be set to true in single node scenario.
+    form-url-resolver:
+        defaultTaskTemplate:  "/tasks/${formKey}/${id}?userId=%userId%"
+        defaultApplicationTemplate: "http://localhost:${server.port}/${applicationName}"
+        defaultProcessTemplate: "/${formKey}?userId=%userId%"
 
 ```
 

diff --git a/docs/reference-guide/components/camunda-interaction-client.md b/docs/reference-guide/components/camunda-interaction-client.md
@@ -24,7 +24,7 @@ To use Camunda Engine Interaction Client please add the following artifact to yo
 ```xml
 <dependency>
   <groupId>io.holunda.polyflow</groupId>
-    <artifactId>polyflow-camunda-bpm-engine-client</artifactId>
+  <artifactId>polyflow-camunda-bpm-engine-client</artifactId>
 </dependency>
 ```
 

diff --git a/docs/reference-guide/components/camunda-taskpool-collector.md b/docs/reference-guide/components/camunda-taskpool-collector.md
@@ -48,11 +48,10 @@ In order to enable collector component, include the Maven dependency to your pro
 ```xml
 
 <dependency>
-  <groupId>io.holunda.polyflow
-    <groupId>
-      <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
-      <version>${camunda-taskpool.version}</version>
-      <dependency>
+  <groupId>io.holunda.polyflow<groupId>
+  <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>
+  <version>${camunda-taskpool.version}</version>
+<dependency>
 
 ```
 

diff --git a/integration/camunda-bpm/engine-client/pom.xml b/integration/camunda-bpm/engine-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-engine-client</artifactId>

diff --git a/integration/camunda-bpm/pom.xml b/integration/camunda-bpm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/integration/camunda-bpm/springboot-autoconfigure/pom.xml b/integration/camunda-bpm/springboot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-springboot-autoconfigure</artifactId>

diff --git a/integration/camunda-bpm/springboot-starter/pom.xml b/integration/camunda-bpm/springboot-starter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-springboot-starter</artifactId>

diff --git a/integration/camunda-bpm/taskpool-collector/pom.xml b/integration/camunda-bpm/taskpool-collector/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-collector</artifactId>

diff --git a/...kotlin/io/holunda/polyflow/taskpool/collector/task/enricher/ProcessVariablesCorrelator.kt b/...kotlin/io/holunda/polyflow/taskpool/collector/task/enricher/ProcessVariablesCorrelator.kt
@@ -15,7 +15,7 @@ open class ProcessVariablesCorrelator(vararg correlations: ProcessVariableCorrel
   /**
    * Correlates variables from a given correlation map for a provided process definition and task definition.
    */
-  fun correlateVariables(processDefinitionKey: ProcessDefinitionKey, taskDefinitionKey: TaskDefinitionKey, variables: VariableMap): CorrelationMap {
+  open fun correlateVariables(processDefinitionKey: ProcessDefinitionKey, taskDefinitionKey: TaskDefinitionKey, variables: VariableMap): CorrelationMap {
 
     val result = newCorrelations()
     val processCorrelations: ProcessVariableCorrelation = all[processDefinitionKey] ?: return result

diff --git a/integration/camunda-bpm/taskpool-job-sender/pom.xml b/integration/camunda-bpm/taskpool-job-sender/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-camunda-bpm-engine-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-camunda-bpm-taskpool-job-sender</artifactId>

diff --git a/integration/common/datapool-sender/pom.xml b/integration/common/datapool-sender/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-datapool-sender</artifactId>

diff --git a/integration/common/pom.xml b/integration/common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/integration/common/tasklist-url-resolver/pom.xml b/integration/common/tasklist-url-resolver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-tasklist-url-resolver</artifactId>

diff --git a/integration/common/taskpool-sender/pom.xml b/integration/common/taskpool-sender/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-taskpool-sender</artifactId>

diff --git a/integration/common/variable-serializer/pom.xml b/integration/common/variable-serializer/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-integration-common-parent</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
   </parent>
 
   <artifactId>polyflow-variable-serializer</artifactId>

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -15,7 +15,7 @@ site_description: >-
  or multiple process engines (like Camunda BPM) providing a holistic enterprise-wide
  task pool and data entry pool.
 
-copyright: Copyright &copy; 2016 - 2022, Holisticon AG
+copyright: Copyright &copy; 2016 - 2024, Holisticon AG
 
 use_directory_urls: false
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.holunda.polyflow</groupId>
   <artifactId>polyflow-root</artifactId>
-  <version>4.1.0</version>
+  <version>4.1.1</version>
   <packaging>pom</packaging>
 
   <name>POM: ${project.artifactId}</name>
@@ -19,7 +19,7 @@
     <java.version>17</java.version>
     <version.java>${java.version}</version.java>
 
-    <kotlin.version>1.9.20</kotlin.version>
+    <kotlin.version>1.9.22</kotlin.version>
     <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     <kotlin-logging.version>3.0.5</kotlin-logging.version>
@@ -46,7 +46,7 @@
         <plugin>
           <groupId>com.amashchenko.maven.plugin</groupId>
           <artifactId>gitflow-maven-plugin</artifactId>
-          <version>1.20.0</version>
+          <version>1.21.0</version>
           <configuration>
             <gitFlowConfig>
               <productionBranch>master</productionBranch>