From 407eb57f83fc32f1f244777ca61f4850e7da834c Mon Sep 17 00:00:00 2001
From: Thomas Heinrichs <52525.thomas@gmail.com>
Date: Tue, 21 Nov 2023 15:18:37 +0100
Subject: [PATCH] feat(stack): update .env and camunda stack (#74)

* feat: update .env and Camunda stack
* fix: adding form to process diagram
---
 .../stack/c7/docker-compose.yml               |  2 +-
 .../stack/camunda-7/docker-compose.yml        |  2 +-
 .../stack/camunda-8/docker-compose.yml        |  2 +-
 .../stack/camunda-7/docker-compose.yml        |  2 +-
 .../stack/camunda-8/docker-compose.yml        |  2 +-
 .../main/resources/satisfaction-miranum.bpmn  | 83 ++++++++++++++++++-
 .../src/main/resources/survey.form            | 74 +++++++++++++++++
 restaurant-showcase/stack/.env                | 10 +--
 .../stack/camunda-7/docker-compose.yml        |  2 +-
 .../stack/camunda-8/docker-compose.yml        |  2 +-
 10 files changed, 167 insertions(+), 14 deletions(-)
 create mode 100644 restaurant-showcase/satisfaction-miranum/src/main/resources/survey.form

diff --git a/customer-onboarding-showcase/stack/c7/docker-compose.yml b/customer-onboarding-showcase/stack/c7/docker-compose.yml
index f83259b..c6e82f3 100644
--- a/customer-onboarding-showcase/stack/c7/docker-compose.yml
+++ b/customer-onboarding-showcase/stack/c7/docker-compose.yml
@@ -2,6 +2,6 @@
 version: '3'
 services:
   camunda:
-    image: camunda/camunda-bpm-platform:7.18.0
+    image: camunda/camunda-bpm-platform:7.20.0
     ports:
       - "8080:8080"
diff --git a/pizza-order-showcase/stack/camunda-7/docker-compose.yml b/pizza-order-showcase/stack/camunda-7/docker-compose.yml
index f83259b..c6e82f3 100644
--- a/pizza-order-showcase/stack/camunda-7/docker-compose.yml
+++ b/pizza-order-showcase/stack/camunda-7/docker-compose.yml
@@ -2,6 +2,6 @@
 version: '3'
 services:
   camunda:
-    image: camunda/camunda-bpm-platform:7.18.0
+    image: camunda/camunda-bpm-platform:7.20.0
     ports:
       - "8080:8080"
diff --git a/pizza-order-showcase/stack/camunda-8/docker-compose.yml b/pizza-order-showcase/stack/camunda-8/docker-compose.yml
index 29ac7d3..5dac433 100644
--- a/pizza-order-showcase/stack/camunda-8/docker-compose.yml
+++ b/pizza-order-showcase/stack/camunda-8/docker-compose.yml
@@ -12,7 +12,7 @@
 services:
 
   zeebe: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#zeebe
-    image: "camunda/zeebe:8.2.0"
+    image: "camunda/zeebe:8.3.2"
     ports:
       - "26500:26500"
       - "5701:5701"
diff --git a/process-example/stack/camunda-7/docker-compose.yml b/process-example/stack/camunda-7/docker-compose.yml
index f83259b..c6e82f3 100644
--- a/process-example/stack/camunda-7/docker-compose.yml
+++ b/process-example/stack/camunda-7/docker-compose.yml
@@ -2,6 +2,6 @@
 version: '3'
 services:
   camunda:
-    image: camunda/camunda-bpm-platform:7.18.0
+    image: camunda/camunda-bpm-platform:7.20.0
     ports:
       - "8080:8080"
diff --git a/process-example/stack/camunda-8/docker-compose.yml b/process-example/stack/camunda-8/docker-compose.yml
index 26818ba..5dac433 100644
--- a/process-example/stack/camunda-8/docker-compose.yml
+++ b/process-example/stack/camunda-8/docker-compose.yml
@@ -12,7 +12,7 @@
 services:
 
   zeebe: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#zeebe
-    image: "camunda/zeebe:8.1.6"
+    image: "camunda/zeebe:8.3.2"
     ports:
       - "26500:26500"
       - "5701:5701"
diff --git a/restaurant-showcase/satisfaction-miranum/src/main/resources/satisfaction-miranum.bpmn b/restaurant-showcase/satisfaction-miranum/src/main/resources/satisfaction-miranum.bpmn
index 1afdb0c..9bc39a1 100644
--- a/restaurant-showcase/satisfaction-miranum/src/main/resources/satisfaction-miranum.bpmn
+++ b/restaurant-showcase/satisfaction-miranum/src/main/resources/satisfaction-miranum.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:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:color="http://www.omg.org/spec/BPMN/non-normative/color/1.0" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1d8gzmj" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.7.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.2.0" camunda:diagramRelationId="0fde6ec5-76dd-4369-942f-655ea4a351d5">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:color="http://www.omg.org/spec/BPMN/non-normative/color/1.0" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1d8gzmj" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.17.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.2.0" camunda:diagramRelationId="0fde6ec5-76dd-4369-942f-655ea4a351d5">
   <bpmn:error id="Error_0q5ht45" name="NoSoya" errorCode="NoSoya" />
   <bpmn:collaboration id="RestaurantCollaboration">
     <bpmn:participant id="Participant_0qn2kv8" name="Customer Satisfaction Survey" processRef="Process_Survey" />
@@ -12,6 +12,82 @@
     </bpmn:extensionElements>
   </bpmn:message>
   <bpmn:process id="Process_Survey" isExecutable="true">
+    <bpmn:extensionElements>
+      <zeebe:userTaskForm id="UserTaskForm_05r2olo">{
+  "components": [
+    {
+      "label": "Customer Name",
+      "type": "textfield",
+      "layout": {
+        "row": "Row_0px1x92",
+        "columns": null
+      },
+      "id": "Field_0vpuwao",
+      "key": "customerName",
+      "description": "Surname, Name",
+      "readonly": true,
+      "disabled": true
+    },
+    {
+      "label": "Ordered Meal",
+      "type": "textfield",
+      "layout": {
+        "row": "Row_1v4qdth",
+        "columns": null
+      },
+      "id": "Field_1ibx0s2",
+      "key": "meal",
+      "disabled": true,
+      "readonly": true
+    },
+    {
+      "label": "Called Customer?",
+      "type": "checkbox",
+      "layout": {
+        "row": "Row_1i1ohx6",
+        "columns": null
+      },
+      "id": "Field_0k441z5",
+      "key": "checkbox_yz16le",
+      "description": "Tick if completed"
+    },
+    {
+      "values": [
+        {
+          "label": "Very",
+          "value": "value"
+        },
+        {
+          "label": "It was ok ",
+          "value": "value2"
+        },
+        {
+          "label": "Could be better ",
+          "value": "value3"
+        }
+      ],
+      "label": "How satisfied was the customer?",
+      "type": "select",
+      "layout": {
+        "row": "Row_14fkjq0",
+        "columns": null
+      },
+      "id": "Field_0znoc5l",
+      "key": "select_zkq4b2",
+      "defaultValue": "value"
+    }
+  ],
+  "type": "default",
+  "id": "form_survey",
+  "executionPlatform": "Camunda Cloud",
+  "executionPlatformVersion": "8.3.0",
+  "exporter": {
+    "name": "Camunda Modeler",
+    "version": "5.17.0"
+  },
+  "schemaVersion": 12
+}</zeebe:userTaskForm>
+    </bpmn:extensionElements>
     <bpmn:startEvent id="StartSatisfactionSurvey" name="StartSatisfactionSurvey">
       <bpmn:extensionElements>
         <zeebe:ioMapping>
@@ -27,6 +103,9 @@
       <bpmn:incoming>Flow_0asbbb8</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:userTask id="Activity_1ejus7a" name="Call Customer">
+      <bpmn:extensionElements>
+        <zeebe:formDefinition formKey="camunda-forms:bpmn:UserTaskForm_05r2olo" />
+      </bpmn:extensionElements>
       <bpmn:incoming>Flow_0prepmc</bpmn:incoming>
       <bpmn:outgoing>Flow_0asbbb8</bpmn:outgoing>
     </bpmn:userTask>
@@ -72,4 +151,4 @@
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
+</bpmn:definitions>
diff --git a/restaurant-showcase/satisfaction-miranum/src/main/resources/survey.form b/restaurant-showcase/satisfaction-miranum/src/main/resources/survey.form
new file mode 100644
index 0000000..5f42297
--- /dev/null
+++ b/restaurant-showcase/satisfaction-miranum/src/main/resources/survey.form
@@ -0,0 +1,74 @@
+{
+  "components": [
+    {
+      "label": "Customer Name",
+      "type": "textfield",
+      "layout": {
+        "row": "Row_0px1x92",
+        "columns": null
+      },
+      "id": "Field_0vpuwao",
+      "key": "customerName",
+      "description": "Surname, Name",
+      "readonly": true,
+      "disabled": true
+    },
+    {
+      "label": "Ordered Meal",
+      "type": "textfield",
+      "layout": {
+        "row": "Row_1v4qdth",
+        "columns": null
+      },
+      "id": "Field_1ibx0s2",
+      "key": "meal",
+      "disabled": true,
+      "readonly": true
+    },
+    {
+      "label": "Called Customer?",
+      "type": "checkbox",
+      "layout": {
+        "row": "Row_1i1ohx6",
+        "columns": null
+      },
+      "id": "Field_0k441z5",
+      "key": "checkbox_yz16le",
+      "description": "Tick if completed"
+    },
+    {
+      "values": [
+        {
+          "label": "Very",
+          "value": "value"
+        },
+        {
+          "label": "It was ok ",
+          "value": "value2"
+        },
+        {
+          "label": "Could be better ",
+          "value": "value3"
+        }
+      ],
+      "label": "How satisfied was the customer?",
+      "type": "select",
+      "layout": {
+        "row": "Row_14fkjq0",
+        "columns": null
+      },
+      "id": "Field_0znoc5l",
+      "key": "select_zkq4b2",
+      "defaultValue": "value"
+    }
+  ],
+  "type": "default",
+  "id": "form_survey",
+  "executionPlatform": "Camunda Cloud",
+  "executionPlatformVersion": "8.3.0",
+  "exporter": {
+    "name": "Camunda Modeler",
+    "version": "5.17.0"
+  },
+  "schemaVersion": 12
+}
\ No newline at end of file
diff --git a/restaurant-showcase/stack/.env b/restaurant-showcase/stack/.env
index 34cec30..1b13c71 100644
--- a/restaurant-showcase/stack/.env
+++ b/restaurant-showcase/stack/.env
@@ -1,13 +1,13 @@
 ## Image versions ##
-CAMUNDA_CONNECTORS_VERSION=0.17.1
-CAMUNDA_PLATFORM_VERSION=8.2.0
-ELASTIC_VERSION=7.17.5
+CAMUNDA_CONNECTORS_VERSION=8.3.1
+CAMUNDA_PLATFORM_VERSION=8.3.2
+ELASTIC_VERSION=8.8.2
 POSTGRES_VERSION=14.5-alpine
-KAFKA_VERSION=7.3.2
+KAFKA_VERSION=7.4.3
 
 ## Configuration ##
 # By default the zeebe api is public, when setting this to `identity` a valid zeebe client token is required
 ZEEBE_AUTHENTICATION_MODE=none
 ZEEBE_CLIENT_ID=zeebe
 ZEEBE_CLIENT_SECRET=zecret
-JAVA_OPTIONS=-Xmx128m
+JAVA_OPTIONS=-Xmx8192m
diff --git a/schema-client-example/stack/camunda-7/docker-compose.yml b/schema-client-example/stack/camunda-7/docker-compose.yml
index f83259b..c6e82f3 100644
--- a/schema-client-example/stack/camunda-7/docker-compose.yml
+++ b/schema-client-example/stack/camunda-7/docker-compose.yml
@@ -2,6 +2,6 @@
 version: '3'
 services:
   camunda:
-    image: camunda/camunda-bpm-platform:7.18.0
+    image: camunda/camunda-bpm-platform:7.20.0
     ports:
       - "8080:8080"
diff --git a/schema-client-example/stack/camunda-8/docker-compose.yml b/schema-client-example/stack/camunda-8/docker-compose.yml
index 26818ba..5dac433 100644
--- a/schema-client-example/stack/camunda-8/docker-compose.yml
+++ b/schema-client-example/stack/camunda-8/docker-compose.yml
@@ -12,7 +12,7 @@
 services:
 
   zeebe: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#zeebe
-    image: "camunda/zeebe:8.1.6"
+    image: "camunda/zeebe:8.3.2"
     ports:
       - "26500:26500"
       - "5701:5701"