diff --git a/README.md b/README.md index 5e966b4..5fa5d4e 100644 --- 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 index 04ff66b..7cb2204 100644 --- a/pom.xml +++ b/pom.xml @@ -32,26 +32,26 @@ - 1.8 + 17 8 8 - 2.7.11 - 7.19.0 + 3.1.4 + 7.20.0 3.11 - 4.13.2 + 5.10.0 4.10.0 - 3.0.0 - 3.2.1 + 3.0.1 + 3.3.0 3.11.0 4.2 3.5.0 - 3.0.1 + 3.1.0 2.15.0 - 1.19.0 + 1.20.0 @@ -100,9 +100,9 @@ - junit - junit - ${junit.version} + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} test 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 index cd350dd..89ae79c 100644 --- 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/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspectPropertiesTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspectPropertiesTest.java index dba1de4..cdf1bf1 100644 --- a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/ExternalTaskRetryAspectPropertiesTest.java +++ b/src/test/java/de/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/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/CustomRetryTimeCycleIdentifierTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/CustomRetryTimeCycleIdentifierTest.java index 49ed646..9265234 100644 --- a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/CustomRetryTimeCycleIdentifierTest.java +++ b/src/test/java/de/viadee/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/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/DefaultBehaviourForExceptionTypesTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/DefaultBehaviourForExceptionTypesTest.java index 7db92a1..d1ef420 100644 --- a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/DefaultBehaviourForExceptionTypesTest.java +++ b/src/test/java/de/viadee/bpm/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 index 7d05296..0bccbcf 100644 --- 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/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidDefaultBehaviourTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidDefaultBehaviourTest.java index fe1f554..97b823e 100644 --- a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidDefaultBehaviourTest.java +++ b/src/test/java/de/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/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidRetryTimeCycleValuesTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidRetryTimeCycleValuesTest.java index 2d6672e..7fffc91 100644 --- a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/InvalidRetryTimeCycleValuesTest.java +++ b/src/test/java/de/viadee/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/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/RetryTimeCycleListTest.java b/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/RetryTimeCycleListTest.java index 71fb997..a6d0d57 100644 --- a/src/test/java/de/viadee/bpm/camunda/externaltask/retry/aspect/behaviour/RetryTimeCycleListTest.java +++ b/src/test/java/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;