From 094d276981ca37faa8f9c5fe90323b2d9fc6f0bf Mon Sep 17 00:00:00 2001
From: rnschk <rnschk@gmail.com>
Date: Sun, 21 Feb 2021 17:13:13 +0100
Subject: [PATCH 1/5] * prepare gitflow * version > 1.1.5-SNAPSHOT * add
 versions-maven-plugin

---
 pom.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 762a18a..46292b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,10 +7,10 @@
     <groupId>de.viadee.bpm.camunda</groupId>
     <artifactId>external-task-retry-aspect-spring-boot-starter</artifactId>
     <name>External Task Retry Aspect</name>
-    <description>This tool helps to control the retry-behaviour in external-task-handlers based on the official java-client provided by
-        Camunda BPM
+    <description>This tool helps to control the retry-behaviour in external-task-handlers
+        based on the official java-client provided by Camunda BPM
     </description>
-    <version>1.1.4</version>
+    <version>1.1.5-SNAPSHOT</version>
     <inceptionYear>2021</inceptionYear>
 
     <organization>
@@ -37,7 +37,7 @@
         <maven.compiler.target>8</maven.compiler.target>
 
         <!-- versions -->
-        <spring-boot.version>2.4.2</spring-boot.version>
+        <spring-boot.version>2.4.3</spring-boot.version>
         <external-task-client.version>1.4.1</external-task-client.version>
         <commons-lang3.version>3.11</commons-lang3.version>
         <junit.version>4.13.2</junit.version>
@@ -50,6 +50,7 @@
         <license-maven.version>3.0</license-maven.version>
         <maven-javadoc.version>3.2.0</maven-javadoc.version>
         <maven-gpg.version>1.6</maven-gpg.version>
+        <versions-maven.version>2.8.1</versions-maven.version>
         <gitflow-maven.version>1.15.1</gitflow-maven.version>
 
     </properties>
@@ -254,6 +255,12 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>${versions-maven.version}</version>
+            </plugin>
+
             <plugin>
                 <groupId>com.amashchenko.maven.plugin</groupId>
                 <artifactId>gitflow-maven-plugin</artifactId>

From 9382e38af9d879900ba6b5b1759337cac21caf11 Mon Sep 17 00:00:00 2001
From: rnschk <rnschk@gmail.com>
Date: Mon, 22 Feb 2021 12:16:14 +0100
Subject: [PATCH 2/5] Update versions for feature branch

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46292b8..fec6726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <description>This tool helps to control the retry-behaviour in external-task-handlers
         based on the official java-client provided by Camunda BPM
     </description>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.5-use-interface-in-aspect-SNAPSHOT</version>
     <inceptionYear>2021</inceptionYear>
 
     <organization>

From c9a7e5660d2f09ea0bb07b0dae06375d74657cde Mon Sep 17 00:00:00 2001
From: rnschk <rnschk@gmail.com>
Date: Mon, 22 Feb 2021 12:17:32 +0100
Subject: [PATCH 3/5] use interface-type in aspect/pointcut

---
 .../externaltask/retry/aspect/ExternalTaskRetryAspect.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspect.java b/src/main/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspect.java
index 8f043c2..aa364a5 100644
--- a/src/main/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspect.java
+++ b/src/main/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspect.java
@@ -41,7 +41,6 @@
 import org.aspectj.lang.annotation.Pointcut;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
-import org.camunda.bpm.client.task.impl.ExternalTaskServiceImpl;
 
 
 @Aspect
@@ -59,7 +58,7 @@ public ExternalTaskRetryAspect(final BusinessErrorService businessErrorService,
                                     "&& args(externalTask, externalTaskService)",
               argNames = "externalTask,externalTaskService")
     public void externalTaskHandlerExecute(final ExternalTask externalTask,
-                                           final ExternalTaskServiceImpl externalTaskService) {
+                                           final ExternalTaskService externalTaskService) {
     }
 
     @AfterThrowing(pointcut = "externalTaskHandlerExecute(externalTask, externalTaskService)",

From bc0537d3caed43bca3b51bee18cb0c2b2e1d45b5 Mon Sep 17 00:00:00 2001
From: rnschk <rnschk@gmail.com>
Date: Mon, 22 Feb 2021 12:18:06 +0100
Subject: [PATCH 4/5] Update versions for development branch

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fec6726..46292b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <description>This tool helps to control the retry-behaviour in external-task-handlers
         based on the official java-client provided by Camunda BPM
     </description>
-    <version>1.1.5-use-interface-in-aspect-SNAPSHOT</version>
+    <version>1.1.5-SNAPSHOT</version>
     <inceptionYear>2021</inceptionYear>
 
     <organization>

From 5348d5a4cea03b5190061abd7aebe2701ae85599 Mon Sep 17 00:00:00 2001
From: rnschk <rnschk@gmail.com>
Date: Mon, 22 Feb 2021 12:18:42 +0100
Subject: [PATCH 5/5] Update versions for release

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46292b8..d170dc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <description>This tool helps to control the retry-behaviour in external-task-handlers
         based on the official java-client provided by Camunda BPM
     </description>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.5</version>
     <inceptionYear>2021</inceptionYear>
 
     <organization>