From 7c9c364b6c081ecf27d60620feca1e97ce330f53 Mon Sep 17 00:00:00 2001
From: dominikhorn <dominik.horn93@gmail.com>
Date: Thu, 30 Nov 2023 09:00:58 +0100
Subject: [PATCH] fix: camunda 7 worker retries

---
 .../connect/adapter/in/c7/worker/Camunda7WorkerAdapter.java  | 2 +-
 .../src/main/resources/application.properties                | 1 -
 .../src/main/resources/bpmn/message-c7.bpmn                  | 4 ++--
 stack/camunda-7/docker-compose.yml                           | 5 +++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/connect/connect-c7/worker-adapter-c7/src/main/java/io/miragon/miranum/connect/adapter/in/c7/worker/Camunda7WorkerAdapter.java b/connect/connect-c7/worker-adapter-c7/src/main/java/io/miragon/miranum/connect/adapter/in/c7/worker/Camunda7WorkerAdapter.java
index 37b3c03cf..d1a7907a8 100644
--- a/connect/connect-c7/worker-adapter-c7/src/main/java/io/miragon/miranum/connect/adapter/in/c7/worker/Camunda7WorkerAdapter.java
+++ b/connect/connect-c7/worker-adapter-c7/src/main/java/io/miragon/miranum/connect/adapter/in/c7/worker/Camunda7WorkerAdapter.java
@@ -49,7 +49,7 @@ public void execute(final WorkerExecutor executor, final ExternalTask externalTa
         } catch (final Exception error) {
             int retries = getRemainingRetries(externalTask.getRetries(), workerRetries);
             log.severe("Error while executing external task " + error.getMessage());
-            service.handleFailure(externalTask, error.getMessage(), Arrays.toString(error.getStackTrace()), retries, 5000L);
+            service.handleFailure(externalTask, error.getMessage(), Arrays.toString(error.getStackTrace()), retries -1, 5000L);
         }
     }
 
diff --git a/examples/simple-example/simple-example-camunda-7/src/main/resources/application.properties b/examples/simple-example/simple-example-camunda-7/src/main/resources/application.properties
index 960962548..2a079d3c0 100644
--- a/examples/simple-example/simple-example-camunda-7/src/main/resources/application.properties
+++ b/examples/simple-example/simple-example-camunda-7/src/main/resources/application.properties
@@ -1,7 +1,6 @@
 server.port=9090
 camunda.bpm.client.base-url=http://localhost:8080/engine-rest
 camunda.bpm.client.disable-backoff-strategy=true
-camunda.autoDeploy.enabled=false
 #logging.level.root=DEBUG
 #miranum.c7.auth.server.url=http://localhost:8080/auth/realms/forms-flow-ai/protocol/openid-connect/token
 #miranum.c7.client.id=test-client
diff --git a/examples/simple-example/simple-example-camunda-7/src/main/resources/bpmn/message-c7.bpmn b/examples/simple-example/simple-example-camunda-7/src/main/resources/bpmn/message-c7.bpmn
index 61a583206..5ac820d55 100644
--- a/examples/simple-example/simple-example-camunda-7/src/main/resources/bpmn/message-c7.bpmn
+++ b/examples/simple-example/simple-example-camunda-7/src/main/resources/bpmn/message-c7.bpmn
@@ -1,6 +1,6 @@
 <?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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1dolndx" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.8.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.17.0">
-  <bpmn:process id="SimpleExampleProcess" name="Simple Example Process" isExecutable="true">
+<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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1dolndx" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.15.1" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.17.0">
+  <bpmn:process id="SimpleExampleProcess" name="Simple Example Process" isExecutable="true" camunda:historyTimeToLive="10">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_0yx0bta</bpmn:outgoing>
     </bpmn:startEvent>
diff --git a/stack/camunda-7/docker-compose.yml b/stack/camunda-7/docker-compose.yml
index f83259b99..d7ff917e6 100644
--- a/stack/camunda-7/docker-compose.yml
+++ b/stack/camunda-7/docker-compose.yml
@@ -1,7 +1,8 @@
 # Use this only in dev environments. It's not intended for production usage.
 version: '3'
 services:
-  camunda:
-    image: camunda/camunda-bpm-platform:7.18.0
+  camunda-miranum:
+    image: camunda/camunda-bpm-platform:7.20.0
+    container_name: camunda-miranum
     ports:
       - "8080:8080"