Merge branch 'release/3.3.3'

holunda-io · Oct 26, 2022 · 2018113 · 2018113
2 parents a7997f7 + 2c14d0d
commit 2018113
Show file tree

Hide file tree

Showing 64 changed files with 616 additions and 491 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,13 +1,14 @@
-name: CI for branches
+name: CI for special branches
 
 on:
   push:
     branches:
       - '!master'
       - '!develop'
       - '!release/*'
-      - '*'
-      - '**/*'
+      - 'dependabot/**'
+      - 'feature/**'
+      - 'bugfix/**'
 
 jobs:
   build:
@@ -18,19 +19,20 @@ jobs:
         jdk: ['11.0.5']
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Cache .m2
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.jdk }}
 
       - name: Prepare Maven Wrapper

diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -29,10 +29,10 @@ jobs:
         run: echo "::set-output name=dir::$(pip cache dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('./docs/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
@@ -58,6 +58,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: echo ::set-output name=TAG_NAME::${GITHUB_REF/refs\/tags\//}
 
+      # This is for a tagged version
       - name: Create a new version of documentation and push to GH pages.
         if: startsWith(github.ref, 'refs/tags/')
         run: mike deploy ${{ steps.get_tag_name.outputs.TAG_NAME }} stable --push --rebase --update-aliases
@@ -66,6 +67,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: mike set-default stable --push --rebase
 
+      # This is for develop
       - name: Deploy latest develop snapshot docs to GH pages.
         if: github.ref == 'refs/heads/develop'
-        run: mike deploy snapshot --push --rebase
+        run: mike deploy snapshot --push --rebase --update-aliases
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Cache .m2
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -29,9 +29,10 @@ jobs:
 
       # Setup JDK and Maven
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11.0.5
+          distribution: 'zulu'
           server-id: ossrh
           server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
           server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central

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>3.3.2</version>
+    <version>3.3.3</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>3.3.2</version>
+    <version>3.3.3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -18,17 +18,17 @@
   <url>https://github.com/holunda-io/camunda-bpm-taskpool/</url>
 
   <properties>
-    <springboot.version>2.7.2</springboot.version>
-    <camunda-commons-typed-values.version>7.17.0</camunda-commons-typed-values.version>
+    <springboot.version>2.7.5</springboot.version>
+    <camunda-commons-typed-values.version>7.18.0</camunda-commons-typed-values.version>
 
-    <axon-bom.version>4.5.17</axon-bom.version>
+    <axon-bom.version>4.6.1</axon-bom.version>
 
-    <axon-kotlin.version>0.2.0</axon-kotlin.version>
+    <axon-kotlin.version>4.6.0</axon-kotlin.version>
     <axon-gateway-extension.version>0.1.1</axon-gateway-extension.version>
 
     <awaitability.version>4.2.0</awaitability.version>
     <mockito-kotlin.version>4.0.0</mockito-kotlin.version>
-    <jgiven.version>1.2.2</jgiven.version>
+    <jgiven.version>1.2.4</jgiven.version>
 
     <pattern.class.itest>**/*ITest.*</pattern.class.itest>
     <pattern.package.itest>**/itest/**/*.*</pattern.package.itest>
@@ -387,7 +387,7 @@
           <!-- jar -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>3.3.0</version>
           <configuration>
             <archive>
               <manifest>
@@ -572,7 +572,7 @@
         <plugin>
           <groupId>org.jetbrains.dokka</groupId>
           <artifactId>dokka-maven-plugin</artifactId>
-          <version>1.7.10</version>
+          <version>1.7.20</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>

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>3.3.2</version>
+    <version>3.3.3</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>3.3.2</version>
+    <version>3.3.3</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

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

diff --git a/core/datapool/datapool-core/pom.xml b/core/datapool/datapool-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-datapool-parent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.3</version>
   </parent>
 
   <artifactId>polyflow-datapool-core</artifactId>
@@ -20,6 +20,7 @@
       <groupId>io.holunda.polyflow</groupId>
       <artifactId>polyflow-datapool-event</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
@@ -39,6 +40,11 @@
       <version>2.1.3</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.holunda.polyflow</groupId>
+      <artifactId>polyflow-bus-jackson</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>

diff --git a/...ool-core/src/main/kotlin/io/holunda/polyflow/datapool/core/business/DataEntryAggregate.kt b/...ool-core/src/main/kotlin/io/holunda/polyflow/datapool/core/business/DataEntryAggregate.kt
@@ -32,20 +32,7 @@ class DataEntryAggregate() {
   @CommandHandler
   constructor(command: CreateDataEntryCommand) : this() {
     AggregateLifecycle.apply(
-      DataEntryCreatedEvent(
-        entryId = command.dataEntryChange.entryId,
-        entryType = command.dataEntryChange.entryType,
-        name = command.dataEntryChange.name,
-        type = command.dataEntryChange.type,
-        applicationName = command.dataEntryChange.applicationName,
-        state = command.dataEntryChange.state,
-        description = command.dataEntryChange.description,
-        payload = command.dataEntryChange.payload,
-        correlations = command.dataEntryChange.correlations,
-        createModification = command.dataEntryChange.modification,
-        authorizations = command.dataEntryChange.authorizationChanges,
-        formKey = command.dataEntryChange.formKey
-      )
+      command.createdEvent()
     )
   }
 
@@ -55,20 +42,7 @@ class DataEntryAggregate() {
   @CommandHandler
   fun handle(command: UpdateDataEntryCommand) {
     AggregateLifecycle.apply(
-      DataEntryUpdatedEvent(
-        entryId = command.dataEntryChange.entryId,
-        entryType = command.dataEntryChange.entryType,
-        name = command.dataEntryChange.name,
-        type = command.dataEntryChange.type,
-        applicationName = command.dataEntryChange.applicationName,
-        state = command.dataEntryChange.state,
-        description = command.dataEntryChange.description,
-        payload = command.dataEntryChange.payload,
-        correlations = command.dataEntryChange.correlations,
-        updateModification = command.dataEntryChange.modification,
-        authorizations = command.dataEntryChange.authorizationChanges,
-        formKey = command.dataEntryChange.formKey
-      )
+      command.updatedEvent()
     )
   }
 

diff --git a/core/datapool/datapool-core/src/test/resources/db/migrations/V0_0_2__axon_dlq.sql b/core/datapool/datapool-core/src/test/resources/db/migrations/V0_0_2__axon_dlq.sql
@@ -0,0 +1,25 @@
+CREATE TABLE dead_letter_entry (
+    dead_letter_id       VARCHAR(255) NOT NULL,
+    cause_message        VARCHAR(255),
+    cause_type           VARCHAR(255),
+    diagnostics          BLOB,
+    enqueued_at          TIMESTAMP    NOT NULL,
+    last_touched         TIMESTAMP,
+    aggregate_identifier VARCHAR(255),
+    event_identifier     VARCHAR(255) NOT NULL,
+    message_type         VARCHAR(255) NOT NULL,
+    meta_data            BLOB,
+    payload              BLOB         NOT NULL,
+    payload_revision     VARCHAR(255),
+    payload_type         VARCHAR(255) NOT NULL,
+    sequence_number      INT8,
+    time_stamp           VARCHAR(255) NOT NULL,
+    token                BLOB,
+    token_type           VARCHAR(255),
+    type                 VARCHAR(255),
+    processing_group     VARCHAR(255) NOT NULL,
+    processing_started   TIMESTAMP,
+    sequence_identifier  VARCHAR(255) NOT NULL,
+    sequence_index       INT8         NOT NULL,
+    PRIMARY KEY (dead_letter_id)
+);
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>3.3.2</version>
+    <version>3.3.3</version>
   </parent>
 
   <artifactId>polyflow-datapool-event</artifactId>

diff --git a/...datapool-event/src/main/kotlin/io/holunda/camunda/taskpool/api/business/BusinessEvents.kt b/...datapool-event/src/main/kotlin/io/holunda/camunda/taskpool/api/business/BusinessEvents.kt
@@ -27,7 +27,7 @@ data class DataEntryCreatedEvent(
    */
   val applicationName: String,
   /**
-   * Human readable identifier or name, e.g. "BANF-4711 - TV for meeting room"
+   * Human-readable identifier or name, e.g. "BANF-4711 - TV for meeting room"
    */
   val name: String,
   /**
@@ -82,7 +82,7 @@ data class DataEntryUpdatedEvent(
    */
   val applicationName: String,
   /**
-   * Human readable identifier or name, e.g. "BANF-4711 - TV for meeting room"
+   * Human-readable identifier or name, e.g. "BANF-4711 - TV for meeting room"
    */
   val name: String,
   /**

diff --git a/...tapool/datapool-event/src/main/kotlin/io/holunda/camunda/taskpool/api/business/Mappers.kt b/...tapool/datapool-event/src/main/kotlin/io/holunda/camunda/taskpool/api/business/Mappers.kt
@@ -0,0 +1,31 @@
+package io.holunda.camunda.taskpool.api.business
+
+fun CreateDataEntryCommand.createdEvent() = DataEntryCreatedEvent(
+  entryId = this.dataEntryChange.entryId,
+  entryType = this.dataEntryChange.entryType,
+  name = this.dataEntryChange.name,
+  type = this.dataEntryChange.type,
+  applicationName = this.dataEntryChange.applicationName,
+  state = this.dataEntryChange.state,
+  description = this.dataEntryChange.description,
+  payload = this.dataEntryChange.payload,
+  correlations = this.dataEntryChange.correlations,
+  createModification = this.dataEntryChange.modification,
+  authorizations = this.dataEntryChange.authorizationChanges,
+  formKey = this.dataEntryChange.formKey
+)
+
+fun UpdateDataEntryCommand.updatedEvent() = DataEntryUpdatedEvent(
+  entryId = this.dataEntryChange.entryId,
+  entryType = this.dataEntryChange.entryType,
+  name = this.dataEntryChange.name,
+  type = this.dataEntryChange.type,
+  applicationName = this.dataEntryChange.applicationName,
+  state = this.dataEntryChange.state,
+  description = this.dataEntryChange.description,
+  payload = this.dataEntryChange.payload,
+  correlations = this.dataEntryChange.correlations,
+  updateModification = this.dataEntryChange.modification,
+  authorizations = this.dataEntryChange.authorizationChanges,
+  formKey = this.dataEntryChange.formKey
+)
diff --git a/core/datapool/pom.xml b/core/datapool/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.3</version>
     <relativePath>../../bom/parent/pom.xml</relativePath>
   </parent>
 

diff --git a/core/taskpool/pom.xml b/core/taskpool/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.holunda.polyflow</groupId>
     <artifactId>polyflow-parent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.3</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>3.3.2</version>
+    <version>3.3.3</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>3.3.2</version>
+    <version>3.3.3</version>
   </parent>
 
   <artifactId>polyflow-taskpool-core</artifactId>