Merge branch 'version/1.8.0'

viadee · Oct 13, 2023 · 80cc873 · 80cc873
2 parents 02c271b + e097a24
commit 80cc873
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # external-task-retry-aspect
 [![](https://img.shields.io/maven-central/v/de.viadee.bpm.camunda/external-task-retry-aspect-spring-boot-starter)](https://search.maven.org/artifact/de.viadee.bpm.camunda/external-task-retry-aspect-spring-boot-starter)
 ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/viadee/external-task-retry-aspect)
-[![](https://img.shields.io/badge/External%20Task%20Handler-7.19.0-orange.svg)](https://docs.camunda.org/manual/7.19/user-guide/ext-client/spring-boot-starter)
+[![](https://img.shields.io/badge/External%20Task%20Handler-7.20.0-orange.svg)](https://docs.camunda.org/manual/7.20/user-guide/ext-client/spring-boot-starter)
 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/viadee/external-task-retry-aspect/maven-build.yml)
 [![](https://img.shields.io/github/issues/viadee/external-task-retry-aspect)](https://github.com/viadee/external-task-retry-aspect/issues)
 [![](https://img.shields.io/github/stars/viadee/external-task-retry-aspect)](https://github.com/viadee/external-task-retry-aspect/stargazers)
@@ -159,6 +159,7 @@ any issue, please feel free to contact me.
 |        1.5.x |               7.18.0 |       2.7.x |
 |        1.6.x |               7.19.0 |       2.7.x |
 |        1.7.x |               7.19.0 |       2.7.x |
+|        1.8.x |               7.20.0 |       3.1.x |
 
 ## 🤹 Collaboration
 This tool was build by viadee Unternehmensberatung AG. If you are interested to find out what 
@@ -169,10 +170,6 @@ If you have any feedback, ideas or extensions feel free to contact or create a G
 
 * Many thanks to [@ChrisSchoe][u_chrisschoe] for making the external-task-retry-aspect spring-boot-3-ready ([#107][i107])
 
-## 📫 Contact
-
-[![rnschk](https://img.shields.io/twitter/follow/rnschk.svg)](https://twitter.com/rnschk)
-
 ## 🔑 License
 
 [![](https://img.shields.io/github/license/viadee/external-task-retry-aspect)](https://github.com/viadee/external-task-retry-aspect/blob/master/LICENSE)

diff --git 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.7.1</version>
+    <version>1.8.0</version>
     <inceptionYear>2021</inceptionYear>
 
     <organization>
@@ -32,26 +32,26 @@
 
     <properties>
         <!-- settings -->
-        <java.version>1.8</java.version>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- versions -->
-        <spring-boot.version>2.7.11</spring-boot.version>
-        <external-task-client.version>7.19.0</external-task-client.version>
+        <spring-boot.version>3.1.4</spring-boot.version>
+        <external-task-client.version>7.20.0</external-task-client.version>
         <commons-lang3.version>3.11</commons-lang3.version>
-        <junit.version>4.13.2</junit.version>
+        <junit-jupiter.version>5.10.0</junit-jupiter.version>
         <mockito.version>4.10.0</mockito.version>
 
         <!-- plugins -->
-        <maven-release.version>3.0.0</maven-release.version>
-        <maven-source.version>3.2.1</maven-source.version>
+        <maven-release.version>3.0.1</maven-release.version>
+        <maven-source.version>3.3.0</maven-source.version>
         <maven-compiler.version>3.11.0</maven-compiler.version>
         <license-maven.version>4.2</license-maven.version>
         <maven-javadoc.version>3.5.0</maven-javadoc.version>
-        <maven-gpg.version>3.0.1</maven-gpg.version>
+        <maven-gpg.version>3.1.0</maven-gpg.version>
         <versions-maven.version>2.15.0</versions-maven.version>
-        <gitflow-maven.version>1.19.0</gitflow-maven.version>
+        <gitflow-maven.version>1.20.0</gitflow-maven.version>
 
     </properties>
 
@@ -100,9 +100,9 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/BaseTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/BaseTest.java
@@ -36,14 +36,14 @@
 import org.aspectj.lang.JoinPoint;
 import org.camunda.bpm.client.task.ExternalTask;
 import org.camunda.bpm.client.task.ExternalTaskService;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -60,7 +60,7 @@
 @SuppressWarnings({"unchecked", "rawtypes"})
 @ContextConfiguration(classes = {ExternalTaskRetryAspectAutoConfiguration.class})
 @ActiveProfiles("test")
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 public abstract class BaseTest {
 
     //@formatter:off
@@ -87,7 +87,7 @@ public abstract class BaseTest {
     protected ExternalTaskRetryAspectProperties properties;
 
 
-    @Before
+    @BeforeEach
     public void initTestData() {
         Mockito.reset(this.externalTask, this.externalTaskService, this.joinPoint);
         Mockito.when(this.joinPoint.getTarget()).thenReturn(Object.class);

diff --git a/...e/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspectPropertiesTest.java b/...e/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspectPropertiesTest.java
@@ -32,9 +32,10 @@
 package de.viadee.bpm.camunda.externaltask.retry.aspect;
 
 import de.viadee.bpm.camunda.externaltask.retry.aspect.config.ExternalTaskRetryAspectProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import static org.junit.Assert.assertEquals;
 
 public class ExternalTaskRetryAspectPropertiesTest {
 

diff --git a/...e/bpm/camunda/externaltask/retry/aspect/behaviour/CustomRetryTimeCycleIdentifierTest.java b/...e/bpm/camunda/externaltask/retry/aspect/behaviour/CustomRetryTimeCycleIdentifierTest.java
@@ -32,10 +32,10 @@
 package de.viadee.bpm.camunda.externaltask.retry.aspect.behaviour;
 
 import de.viadee.bpm.camunda.externaltask.retry.aspect.BaseTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.TestPropertySource;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 @TestPropertySource(properties = "de.viadee.bpm.camunda.external-task.retry-config.identifier=CUSTOM_SOMETHING")

diff --git a/...pm/camunda/externaltask/retry/aspect/behaviour/DefaultBehaviourForExceptionTypesTest.java b/...pm/camunda/externaltask/retry/aspect/behaviour/DefaultBehaviourForExceptionTypesTest.java
@@ -36,7 +36,7 @@
 import de.viadee.bpm.camunda.externaltask.retry.aspect.error.InstantIncidentException;
 import org.camunda.bpm.engine.variable.VariableMap;
 import org.camunda.bpm.engine.variable.Variables;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;

diff --git a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/EdgeCaseTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/EdgeCaseTest.java
@@ -32,9 +32,9 @@
 package de.viadee.bpm.camunda.externaltask.retry.aspect.behaviour;
 
 import de.viadee.bpm.camunda.externaltask.retry.aspect.BaseTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.when;
 
 

diff --git a/...e/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidDefaultBehaviourTest.java b/...e/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidDefaultBehaviourTest.java
@@ -32,7 +32,7 @@
 package de.viadee.bpm.camunda.externaltask.retry.aspect.behaviour;
 
 import de.viadee.bpm.camunda.externaltask.retry.aspect.BaseTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.mockito.Mockito.when;

diff --git a/...adee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidRetryTimeCycleValuesTest.java b/...adee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidRetryTimeCycleValuesTest.java
@@ -32,7 +32,7 @@
 package de.viadee.bpm.camunda.externaltask.retry.aspect.behaviour;
 
 import de.viadee.bpm.camunda.externaltask.retry.aspect.BaseTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.mockito.Mockito.when;

diff --git a/...ava/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/RetryTimeCycleListTest.java b/...ava/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/RetryTimeCycleListTest.java
@@ -32,7 +32,7 @@
 package de.viadee.bpm.camunda.externaltask.retry.aspect.behaviour;
 
 import de.viadee.bpm.camunda.externaltask.retry.aspect.BaseTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Objects;