Merge branch 'release/1.21.1'

holunda-io · Oct 8, 2024 · 8c5fd0c · 8c5fd0c
2 parents bf6832c + 04ac553
commit 8c5fd0c
Show file tree

Hide file tree

Showing 16 changed files with 399 additions and 84 deletions.
diff --git a/.codacy.yaml b/.codacy.yaml
@@ -6,4 +6,5 @@ engines:
 exclude_paths:
   - "README.md"
   - ".github/**"
-  - "docs/**"
+  - "docs/**"
+  - "**/src/test/kotlin/**"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,10 +1,15 @@
 version: 2
 updates:
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  default-labels:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 19
+    labels:
+      - "Type: dependencies"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
       - "Type: dependencies"
-
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: zulu
@@ -26,7 +26,7 @@ jobs:
         run: chmod +x ./mvnw
 
       - name: Build with Maven
-        run: ./mvnw clean verify -U -B -T4
+        run: ./mvnw clean verify -U -B -T4 -ntp
 
 #      - name: Upload test coverage to Codacy
 #        if: github.event_name == 'push' && github.actor != 'dependabot[bot]'

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Get GPG private key into GPG
       - name: Import GPG Owner Trust
@@ -21,7 +21,7 @@ jobs:
 
       # Setup JDK and Maven
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: zulu
@@ -34,10 +34,10 @@ jobs:
         run: chmod +x ./mvnw
 
       - name: Build with Maven
-        run: ./mvnw clean verify -U -B -T4
+        run: ./mvnw clean verify -U -B -T4 -ntp
 
       - name: Deploy a new version to central
-        run: ./mvnw clean deploy -B -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{secrets.GPG_KEYNAME}}" -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
+        run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{secrets.GPG_KEYNAME}}" -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
         env:
           OSS_CENTRAL_USERNAME: "${{ secrets.SONATYPE_USERNAME }}"
           OSS_CENTRAL_PASSWORD: "${{ secrets.SONATYPE_PASSWORD }}"

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Camunda specific stages and scenarios for the BDD testing tool JGiven written in Kotlin.
 
 [![stable](https://img.shields.io/badge/lifecycle-STABLE-green.svg)](https://github.com/holisticon#open-source-lifecycle)
-[![Camunda 7.20](https://img.shields.io/badge/Camunda%20Version-7.20-orange.svg)]([https://github.com/holisticon#open-source-lifecycle](https://docs.camunda.org/manual/7.20/))
+[![Camunda 7.21](https://img.shields.io/badge/Camunda%20Version-7.21-orange.svg)]([https://github.com/holisticon#open-source-lifecycle](https://docs.camunda.org/manual/7.21/))
 [![Development braches](https://github.com/holunda-io/camunda-bpm-jgiven/workflows/Development%20braches/badge.svg)](https://github.com/holunda-io/camunda-bpm-jgiven/workflows) 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.holunda.testing/camunda-bpm-jgiven/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.holunda.testing/camunda-bpm-jgiven)
 
@@ -29,7 +29,7 @@ Add the following dependency to your Maven pom:
 <dependency>
   <groupId>io.holunda.testing</groupId>
   <artifactId>camunda-bpm-jgiven</artifactId>
-  <version>1.20.0</version>
+  <version>1.21.0</version>
   <scope>test</scope>
 </dependency>
 ```

diff --git a/examples/basic-junit4/pom.xml b/examples/basic-junit4/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>1.21.0</version>
+    <version>1.21.1</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit4</artifactId>

diff --git a/examples/basic-junit5/pom.xml b/examples/basic-junit5/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.holunda.testing</groupId>
     <artifactId>camunda-bpm-jgiven-examples</artifactId>
-    <version>1.21.0</version>
+    <version>1.21.1</version>
   </parent>
 
   <artifactId>camunda-bpm-jgiven-examples-basic-junit5</artifactId>

diff --git a/...les/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt b/...les/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt
@@ -31,6 +31,7 @@ class ApprovalProcessBean(
     const val USER_APPROVE_REQUEST = "user_approve_request"
     const val USER_AMEND_REQUEST = "user_amend_request"
     const val SERVICE_AUTO_APPROVE = "service_auto_approve_request"
+    const val EXTERNAL_INFORM_REJECTION = "external_inform_rejection"
   }
 
   /**
@@ -40,7 +41,7 @@ class ApprovalProcessBean(
     const val APPROVAL_REQUEST_ID = "approvalRequestId"
     const val APPROVAL_STRATEGY = "approvalStrategy"
     const val APPROVAL_DECISION = "approvalDecision"
-    const val AMEND_ACTION = "ammendAction"
+    const val AMEND_ACTION = "amendAction"
     const val ORIGINATOR = "originator"
   }
 
@@ -54,6 +55,9 @@ class ApprovalProcessBean(
     const val AUTOMATIC_APPROVAL_FAILED = "automaticApprovalFailed"
     const val APPROVE_REQUEST_TASK_LISTENER = "approveRequestTaskListener"
 
+    const val TOPIC_APPROVE_REQUEST = "approve-request"
+    const val TOPIC_INFORM_ABOUT_REJECTION = "inform-about-rejection"
+
     /**
      * Values for approval strategy.
      */

diff --git a/examples/basic-junit5/src/main/resources/approval.bpmn b/examples/basic-junit5/src/main/resources/approval.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1nzmi6w" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.6.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1nzmi6w" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.20.0">
   <bpmn:process id="approval" name="Approval" isExecutable="true" camunda:historyTimeToLive="1">
     <bpmn:startEvent id="start" name="Approval&#10;started" camunda:asyncAfter="true">
       <bpmn:outgoing>flow1</bpmn:outgoing>
@@ -39,9 +39,9 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${approvalDecision == "APPROVE"}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:endEvent id="end_rejected" name="Request&#10;rejected">
-      <bpmn:incoming>SequenceFlow_1i81jsh</bpmn:incoming>
+      <bpmn:incoming>Flow_0ic9b46</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1i81jsh" name="REJECT" sourceRef="ExclusiveGateway_0aekkob" targetRef="end_rejected">
+    <bpmn:sequenceFlow id="SequenceFlow_1i81jsh" name="REJECT" sourceRef="ExclusiveGateway_0aekkob" targetRef="external_inform_rejection">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${approvalDecision == "REJECT"}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:exclusiveGateway id="ExclusiveGateway_1uzhki5">
@@ -113,6 +113,23 @@
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT5D</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:boundaryEvent>
+    <bpmn:sequenceFlow id="Flow_0ic9b46" sourceRef="external_inform_rejection" targetRef="end_rejected" />
+    <bpmn:serviceTask id="external_inform_rejection" name="Inform about rejection" camunda:asyncAfter="true" camunda:type="external" camunda:topic="inform-about-rejection">
+      <bpmn:incoming>SequenceFlow_1i81jsh</bpmn:incoming>
+      <bpmn:outgoing>Flow_0ic9b46</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:textAnnotation id="TextAnnotation_0498nfc">
+      <bpmn:text>async after</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_1gpu8gl" associationDirection="None" sourceRef="external_inform_rejection" targetRef="TextAnnotation_0498nfc" />
+    <bpmn:textAnnotation id="TextAnnotation_0swfhc6">
+      <bpmn:text>async after</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_114rxl0" associationDirection="None" sourceRef="user_approve_request" targetRef="TextAnnotation_0swfhc6" />
+    <bpmn:textAnnotation id="TextAnnotation_1dtabd4">
+      <bpmn:text>async after</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_11m9eap" associationDirection="None" sourceRef="user_amend_request" targetRef="TextAnnotation_1dtabd4" />
   </bpmn:process>
   <bpmn:error id="Error_0g5zlsr" name="error_auto_approval_failed" errorCode="automaticApprovalFailed" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -141,18 +158,6 @@
           <dc:Bounds x="1027" y="346" width="47" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_1rvg3im_di" bpmnElement="end_approved">
-        <dc:Bounds x="1214" y="311" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1209" y="354" width="46" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0z5tlto_di" bpmnElement="end_rejected">
-        <dc:Bounds x="1214" y="474" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1212" y="517" width="41" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1uzhki5_di" bpmnElement="ExclusiveGateway_1uzhki5" isMarkerVisible="true">
         <dc:Bounds x="238" y="304" width="50" height="50" />
       </bpmndi:BPMNShape>
@@ -186,6 +191,33 @@
       <bpmndi:BPMNShape id="ExclusiveGateway_1i5ac37_di" bpmnElement="ExclusiveGateway_1i5ac37" isMarkerVisible="true">
         <dc:Bounds x="1062" y="59" width="50" height="50" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0z5tlto_di" bpmnElement="end_rejected">
+        <dc:Bounds x="1352" y="474" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1350" y="517" width="41" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0nty1t1_di" bpmnElement="external_inform_rejection">
+        <dc:Bounds x="1182" y="452" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1rvg3im_di" bpmnElement="end_approved">
+        <dc:Bounds x="1352" y="311" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1347" y="354" width="46" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_1gpu8gl_di" bpmnElement="Association_1gpu8gl">
+        <di:waypoint x="1282" y="461" />
+        <di:waypoint x="1316" y="440" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_114rxl0_di" bpmnElement="Association_114rxl0">
+        <di:waypoint x="946" y="456" />
+        <di:waypoint x="977" y="432" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_11m9eap_di" bpmnElement="Association_11m9eap">
+        <di:waypoint x="1047" y="185" />
+        <di:waypoint x="1118" y="160" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BoundaryEvent_0fym2it_di" bpmnElement="timer">
         <dc:Bounds x="999" y="145" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -230,17 +262,17 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0jqf4xj_di" bpmnElement="SequenceFlow_0jqf4xj">
         <di:waypoint x="1112" y="329" />
-        <di:waypoint x="1214" y="329" />
+        <di:waypoint x="1352" y="329" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1111" y="308" width="52" height="14" />
+          <dc:Bounds x="1144" y="308" width="54" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1i81jsh_di" bpmnElement="SequenceFlow_1i81jsh">
         <di:waypoint x="1087" y="354" />
         <di:waypoint x="1087" y="492" />
-        <di:waypoint x="1214" y="492" />
+        <di:waypoint x="1182" y="492" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1091" y="468" width="44" height="14" />
+          <dc:Bounds x="1102" y="468" width="43" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1p4jixi_di" bpmnElement="SequenceFlow_1p4jixi">
@@ -308,6 +340,22 @@
         <di:waypoint x="1087" y="132" />
         <di:waypoint x="1087" y="109" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ic9b46_di" bpmnElement="Flow_0ic9b46">
+        <di:waypoint x="1282" y="492" />
+        <di:waypoint x="1352" y="492" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="TextAnnotation_0498nfc_di" bpmnElement="TextAnnotation_0498nfc">
+        <dc:Bounds x="1290" y="410" width="100" height="30" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_0swfhc6_di" bpmnElement="TextAnnotation_0swfhc6">
+        <dc:Bounds x="947" y="402" width="100" height="30" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_1dtabd4_di" bpmnElement="TextAnnotation_1dtabd4">
+        <dc:Bounds x="1110" y="130" width="100" height="30" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>