From 407a8642ab78bdc9fd273c29e0063e73baa18149 Mon Sep 17 00:00:00 2001 From: Yakup Ensar Evli <54323073+ensarevlideveloper@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:27:02 +0100 Subject: [PATCH 01/34] ADPT-169: Fixed bugs --- .../adapter/camunda/dto/ReferencedTaskTest.java | 5 ----- .../camunda/api/impl/CamundaTaskRetriever.java | 16 ++++++++++------ .../systemconnector/api/ReferencedTaskTest.java | 5 ----- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/taskana-adapter-camunda-listener/src/test/java/pro/taskana/adapter/camunda/dto/ReferencedTaskTest.java b/taskana-adapter-camunda-listener/src/test/java/pro/taskana/adapter/camunda/dto/ReferencedTaskTest.java index 08887e17..db0d0ed8 100644 --- a/taskana-adapter-camunda-listener/src/test/java/pro/taskana/adapter/camunda/dto/ReferencedTaskTest.java +++ b/taskana-adapter-camunda-listener/src/test/java/pro/taskana/adapter/camunda/dto/ReferencedTaskTest.java @@ -189,11 +189,6 @@ void should_returnCustomIntegers_when_CustomIntegersWereSet() { assertThat(referencedTask.getCustomInt8()).isEqualTo("8"); } - @Test - void should_ReturnHashCode_When_AskedToDoSo() { - assertThat(theTask.hashCode()).isNotNull(); - } - @Test void should_ReturnString_When_ToStringIsCalled() { assertThat(theTask.toString()).isNotNull(); diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java index cb80ef38..cef80eee 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Objects; import org.slf4j.Logger; @@ -87,6 +88,14 @@ private List getCamundaTaskEvents( camundaTaskEventListResource = responseEntity.getBody(); + List retrievedEvents = camundaTaskEventListResource.getCamundaTaskEvents(); + + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("retrieved camunda task events {}", retrievedEvents); + } + + return retrievedEvents; + } catch (Exception e) { LOGGER.error( "Caught exception while trying to retrieve CamundaTaskEvents from system with URL " @@ -94,12 +103,7 @@ private List getCamundaTaskEvents( e); } - List retrievedEvents = camundaTaskEventListResource.getCamundaTaskEvents(); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("retrieved camunda task events {}", retrievedEvents); - } - - return retrievedEvents; + return Collections.emptyList(); } private List getReferencedTasksFromCamundaTaskEvents( diff --git a/taskana-adapter/src/test/java/pro/taskana/adapter/systemconnector/api/ReferencedTaskTest.java b/taskana-adapter/src/test/java/pro/taskana/adapter/systemconnector/api/ReferencedTaskTest.java index 3c0afd03..46c9ef82 100644 --- a/taskana-adapter/src/test/java/pro/taskana/adapter/systemconnector/api/ReferencedTaskTest.java +++ b/taskana-adapter/src/test/java/pro/taskana/adapter/systemconnector/api/ReferencedTaskTest.java @@ -188,11 +188,6 @@ void should_returnCustomIntegers_when_CustomIntegersWereSet() { assertThat(customIntegers).containsOnly(theValue); } - @Test - void should_ReturnHashCode_When_AskedToDoSo() { - assertThat(theTask.hashCode()).isNotNull(); - } - @Test void should_ReturnString_When_ToStringIsCalled() { assertThat(theTask.toString()).isNotNull(); From cca8aa280765f03dc6bac44ffeacb0d63a392cf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 05:57:23 +0000 Subject: [PATCH 02/34] Bump maven-surefire-plugin from 3.0.0-M8 to 3.0.0-M9 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.0.0-M9. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 752e6b3e..8d0af45b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.10.1 3.4.1 3.0.0-M8 - 3.0.0-M8 + 3.0.0-M9 3.2.1 2.7.5 3.9.1.2184 From b433e184f58565668d3df6ef3c42654cf5319f35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:07:20 +0000 Subject: [PATCH 03/34] Bump maven-failsafe-plugin from 3.0.0-M8 to 3.0.0-M9 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.0.0-M9. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.0.0-M9) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d0af45b..ed06e5c2 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.2.1 3.10.1 3.4.1 - 3.0.0-M8 + 3.0.0-M9 3.0.0-M9 3.2.1 2.7.5 From 2e8509b4e4e2b9b8098ad39f27ad31205de9d4b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 05:56:56 +0000 Subject: [PATCH 04/34] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed06e5c2..df264166 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 3.3.0 3.3.2 3.2.1 - 3.10.1 + 3.11.0 3.4.1 3.0.0-M9 3.0.0-M9 From e2d371e243bc17ef129af449012693a1254f8d4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 04:33:10 +0000 Subject: [PATCH 05/34] Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df264166..725d3096 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 3.3.2 3.2.1 3.11.0 - 3.4.1 + 3.5.0 3.0.0-M9 3.0.0-M9 3.2.1 From 13d524365609ac09b5d4de6e8f48eff0182acab6 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 14 Mar 2023 04:54:34 +0100 Subject: [PATCH 06/34] update google-java-format + automatic reformatting --- pom.xml | 2 +- .../adapter/camunda/CamundaListenerConfiguration.java | 1 - .../camunda/parselistener/TaskanaParseListener.java | 1 - .../TaskanaParseListenerProcessEnginePlugin.java | 1 - .../adapter/camunda/tasklistener/TaskanaTaskListener.java | 1 - .../starter/config/OutboxRestServiceAutoConfiguration.java | 1 - .../taskana/adapter/camunda/OutboxRestConfiguration.java | 1 - .../outbox/rest/config/OutboxRestServiceConfig.java | 1 - .../rest/controller/CamundaTaskEventsController.java | 7 +++---- .../outbox/rest/resource/CamundaTaskEventListResource.java | 1 - .../outbox/rest/service/CamundaTaskEventsService.java | 5 ++--- .../pro/taskana/adapter/TaskanaAdapterApplication.java | 1 - .../acceptance/taskrouting/TestTaskRouterForDomainA.java | 1 - .../acceptance/taskrouting/TestTaskRouterForDomainB.java | 1 - .../adapter/test/TaskanaAdapterTestApplication.java | 1 - .../taskana/adapter/integration/AbsIntegrationTest.java | 1 - .../integration/CamundaTaskEventErrorHandlerTest.java | 1 - .../adapter/integration/TaskanaOutboxRequester.java | 1 - .../adapter/integration/TestCancelledTaskRetrieval.java | 1 - .../adapter/integration/TestCompletedTaskRetrieval.java | 3 +-- .../taskana/adapter/integration/TestDisabledTaskClaim.java | 1 - .../adapter/integration/TestFailedTaskCreation.java | 1 - .../taskana/adapter/integration/TestTaskAcquisition.java | 3 +-- .../pro/taskana/adapter/integration/TestTaskClaim.java | 1 - .../taskana/adapter/integration/TestTaskTermination.java | 1 - .../camunda/api/impl/CamundaSystemConnectorImpl.java | 1 - .../camunda/api/impl/CamundaTaskClaimCanceler.java | 1 - .../camunda/api/impl/CamundaTaskClaimer.java | 1 - .../camunda/api/impl/CamundaTaskCompleter.java | 1 - .../camunda/api/impl/CamundaTaskEventCleaner.java | 1 - .../camunda/api/impl/CamundaTaskEventErrorHandler.java | 1 - .../camunda/api/impl/CamundaTaskRetriever.java | 1 - .../camunda/api/impl/CamundaUtilRequester.java | 1 - .../config/CamundaSystemConnectorConfiguration.java | 1 - .../spi/impl/SystemConnectorCamundaProviderImpl.java | 1 - .../acceptance/RetrieveCamundaTaskAccTest.java | 1 - .../configuration/CamundaConnectorTestConfiguration.java | 1 - .../taskana/adapter/TaskanaAdapterWildFlyApplication.java | 1 - .../ExampleTaskRoutingProviderForAdapterTest.java | 1 - .../taskanaconnector/api/impl/TaskInformationMapper.java | 1 - .../api/impl/TaskanaSystemConnectorImpl.java | 1 - .../config/TaskanaSystemConnectorConfiguration.java | 1 - .../spi/impl/TaskanaConnectorProviderImpl.java | 1 - .../adapter/configuration/AdapterConfiguration.java | 1 - .../taskana/adapter/impl/ReferencedTaskClaimCanceler.java | 1 - .../pro/taskana/adapter/impl/ReferencedTaskClaimer.java | 1 - .../pro/taskana/adapter/impl/ReferencedTaskCompleter.java | 1 - .../java/pro/taskana/adapter/impl/TaskanaTaskStarter.java | 1 - .../pro/taskana/adapter/impl/TaskanaTaskTerminator.java | 1 - .../main/java/pro/taskana/adapter/impl/UserContext.java | 1 - .../java/pro/taskana/adapter/manager/AdapterManager.java | 1 - .../systemconnector/spi/SystemConnectorProvider.java | 1 - .../adapter/taskanaconnector/api/TaskanaConnector.java | 1 - .../taskanaconnector/spi/TaskanaConnectorProvider.java | 1 - .../src/main/java/pro/taskana/adapter/util/Assert.java | 1 - 55 files changed, 8 insertions(+), 62 deletions(-) diff --git a/pom.xml b/pom.xml index 725d3096..6b13349b 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 10.3.4 - 1.15.0 + 1.16.0 3.3.0 3.3.2 3.2.1 diff --git a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/CamundaListenerConfiguration.java b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/CamundaListenerConfiguration.java index 9d56256f..1487d650 100644 --- a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/CamundaListenerConfiguration.java +++ b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/CamundaListenerConfiguration.java @@ -5,7 +5,6 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.adapter.camunda.exceptions.SystemException; public class CamundaListenerConfiguration { diff --git a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListener.java b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListener.java index f7aa2370..876dc70a 100644 --- a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListener.java +++ b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListener.java @@ -10,7 +10,6 @@ import org.camunda.bpm.engine.impl.util.xml.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.adapter.camunda.tasklistener.TaskanaTaskListener; /** This class is responsible for adding the TaskanaTaskListener to all user tasks. */ diff --git a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListenerProcessEnginePlugin.java b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListenerProcessEnginePlugin.java index 0dd5bccd..6ce37b7e 100644 --- a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListenerProcessEnginePlugin.java +++ b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/parselistener/TaskanaParseListenerProcessEnginePlugin.java @@ -14,7 +14,6 @@ import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.adapter.camunda.CamundaListenerConfiguration; import pro.taskana.adapter.camunda.exceptions.SystemException; import pro.taskana.adapter.camunda.schemacreator.DB; diff --git a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/tasklistener/TaskanaTaskListener.java b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/tasklistener/TaskanaTaskListener.java index 5351e891..ec1c3f94 100644 --- a/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/tasklistener/TaskanaTaskListener.java +++ b/taskana-adapter-camunda-listener/src/main/java/pro/taskana/adapter/camunda/tasklistener/TaskanaTaskListener.java @@ -26,7 +26,6 @@ import org.camunda.bpm.model.bpmn.instance.camunda.CamundaProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.adapter.camunda.CamundaListenerConfiguration; import pro.taskana.adapter.camunda.dto.ReferencedTask; import pro.taskana.adapter.camunda.dto.VariableValueDto; diff --git a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/src/main/java/pro/taskana/adapter/camunda/outbox/rest/spring/boot/starter/config/OutboxRestServiceAutoConfiguration.java b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/src/main/java/pro/taskana/adapter/camunda/outbox/rest/spring/boot/starter/config/OutboxRestServiceAutoConfiguration.java index 22bab684..056801a4 100644 --- a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/src/main/java/pro/taskana/adapter/camunda/outbox/rest/spring/boot/starter/config/OutboxRestServiceAutoConfiguration.java +++ b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/src/main/java/pro/taskana/adapter/camunda/outbox/rest/spring/boot/starter/config/OutboxRestServiceAutoConfiguration.java @@ -4,7 +4,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - import pro.taskana.adapter.camunda.outbox.rest.config.OutboxRestServiceConfig; import pro.taskana.adapter.camunda.outbox.rest.controller.CamundaTaskEventsController; import pro.taskana.adapter.camunda.parselistener.TaskanaParseListenerProcessEnginePlugin; diff --git a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/OutboxRestConfiguration.java b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/OutboxRestConfiguration.java index 52b26990..0c15178b 100644 --- a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/OutboxRestConfiguration.java +++ b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/OutboxRestConfiguration.java @@ -6,7 +6,6 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.common.api.exceptions.SystemException; public class OutboxRestConfiguration { diff --git a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/config/OutboxRestServiceConfig.java b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/config/OutboxRestServiceConfig.java index 5afba087..7edb831f 100644 --- a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/config/OutboxRestServiceConfig.java +++ b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/config/OutboxRestServiceConfig.java @@ -4,7 +4,6 @@ import java.util.Set; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; - import pro.taskana.adapter.camunda.outbox.rest.controller.CamundaTaskEventsController; import pro.taskana.adapter.camunda.outbox.rest.exception.CamundaTaskEventNotFoundExceptionMapper; import pro.taskana.adapter.camunda.outbox.rest.exception.InvalidArgumentExceptionMapper; diff --git a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/controller/CamundaTaskEventsController.java b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/controller/CamundaTaskEventsController.java index 66371218..0fcced58 100644 --- a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/controller/CamundaTaskEventsController.java +++ b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/controller/CamundaTaskEventsController.java @@ -15,10 +15,6 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import spinjar.com.fasterxml.jackson.core.JsonProcessingException; -import spinjar.com.fasterxml.jackson.core.type.TypeReference; -import spinjar.com.fasterxml.jackson.databind.ObjectMapper; - import pro.taskana.adapter.camunda.outbox.rest.exception.CamundaTaskEventNotFoundException; import pro.taskana.adapter.camunda.outbox.rest.exception.InvalidArgumentException; import pro.taskana.adapter.camunda.outbox.rest.model.CamundaTaskEvent; @@ -28,6 +24,9 @@ import pro.taskana.adapter.camunda.outbox.rest.resource.CamundaTaskEventResource; import pro.taskana.adapter.camunda.outbox.rest.resource.CamundaTaskEventResourceAssembler; import pro.taskana.adapter.camunda.outbox.rest.service.CamundaTaskEventsService; +import spinjar.com.fasterxml.jackson.core.JsonProcessingException; +import spinjar.com.fasterxml.jackson.core.type.TypeReference; +import spinjar.com.fasterxml.jackson.databind.ObjectMapper; /** Controller for the Outbox REST service. */ @Path(Mapping.URL_EVENTS) diff --git a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/resource/CamundaTaskEventListResource.java b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/resource/CamundaTaskEventListResource.java index 624a9908..6e26f02d 100644 --- a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/resource/CamundaTaskEventListResource.java +++ b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/resource/CamundaTaskEventListResource.java @@ -2,7 +2,6 @@ import java.io.Serializable; import java.util.List; - import pro.taskana.adapter.camunda.outbox.rest.model.CamundaTaskEvent; /** diff --git a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/service/CamundaTaskEventsService.java b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/service/CamundaTaskEventsService.java index dc1fc008..9fceca73 100644 --- a/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/service/CamundaTaskEventsService.java +++ b/taskana-adapter-camunda-outbox-rest/src/main/java/pro/taskana/adapter/camunda/outbox/rest/service/CamundaTaskEventsService.java @@ -25,13 +25,12 @@ import org.apache.ibatis.datasource.pooled.PooledDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import spinjar.com.fasterxml.jackson.databind.JsonNode; -import spinjar.com.fasterxml.jackson.databind.ObjectMapper; - import pro.taskana.adapter.camunda.OutboxRestConfiguration; import pro.taskana.adapter.camunda.outbox.rest.exception.CamundaTaskEventNotFoundException; import pro.taskana.adapter.camunda.outbox.rest.exception.InvalidArgumentException; import pro.taskana.adapter.camunda.outbox.rest.model.CamundaTaskEvent; +import spinjar.com.fasterxml.jackson.databind.JsonNode; +import spinjar.com.fasterxml.jackson.databind.ObjectMapper; /** Implementation of the Outbox REST service. */ public class CamundaTaskEventsService { diff --git a/taskana-adapter-camunda-spring-boot-example/src/main/java/pro/taskana/adapter/TaskanaAdapterApplication.java b/taskana-adapter-camunda-spring-boot-example/src/main/java/pro/taskana/adapter/TaskanaAdapterApplication.java index a9060acc..8a6814fc 100644 --- a/taskana-adapter-camunda-spring-boot-example/src/main/java/pro/taskana/adapter/TaskanaAdapterApplication.java +++ b/taskana-adapter-camunda-spring-boot-example/src/main/java/pro/taskana/adapter/TaskanaAdapterApplication.java @@ -5,7 +5,6 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; - import pro.taskana.adapter.configuration.AdapterConfiguration; /** Application that provides an adapter between TASKANA and one or more external systems. */ diff --git a/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainA.java b/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainA.java index 75695a58..8997ce30 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainA.java +++ b/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainA.java @@ -3,7 +3,6 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.common.api.TaskanaEngine; import pro.taskana.spi.routing.api.TaskRoutingProvider; import pro.taskana.task.api.models.Task; diff --git a/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainB.java b/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainB.java index 76db46ff..bd1b60c8 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainB.java +++ b/taskana-adapter-camunda-spring-boot-test/src/main/java/acceptance/taskrouting/TestTaskRouterForDomainB.java @@ -3,7 +3,6 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.common.api.TaskanaEngine; import pro.taskana.spi.routing.api.TaskRoutingProvider; import pro.taskana.task.api.models.Task; diff --git a/taskana-adapter-camunda-spring-boot-test/src/main/java/pro/taskana/adapter/test/TaskanaAdapterTestApplication.java b/taskana-adapter-camunda-spring-boot-test/src/main/java/pro/taskana/adapter/test/TaskanaAdapterTestApplication.java index e6ce6282..8a379451 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/main/java/pro/taskana/adapter/test/TaskanaAdapterTestApplication.java +++ b/taskana-adapter-camunda-spring-boot-test/src/main/java/pro/taskana/adapter/test/TaskanaAdapterTestApplication.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; - import pro.taskana.adapter.configuration.AdapterConfiguration; import pro.taskana.adapter.test.configuration.CamundaConfiguration; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java index 9903fc32..57e7383a 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.web.client.TestRestTemplate; - import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/CamundaTaskEventErrorHandlerTest.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/CamundaTaskEventErrorHandlerTest.java index 17239f12..6054977f 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/CamundaTaskEventErrorHandlerTest.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/CamundaTaskEventErrorHandlerTest.java @@ -17,7 +17,6 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; - import pro.taskana.adapter.camunda.outbox.rest.model.CamundaTaskEvent; import pro.taskana.adapter.impl.ReferencedTaskClaimCanceler; import pro.taskana.adapter.impl.ReferencedTaskClaimer; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TaskanaOutboxRequester.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TaskanaOutboxRequester.java index d14d12ae..f1da9e89 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TaskanaOutboxRequester.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TaskanaOutboxRequester.java @@ -9,7 +9,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; - import pro.taskana.adapter.camunda.outbox.rest.model.CamundaTaskEvent; import pro.taskana.adapter.camunda.outbox.rest.resource.CamundaTaskEventListResource; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCancelledTaskRetrieval.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCancelledTaskRetrieval.java index cd7b416d..42fb981e 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCancelledTaskRetrieval.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCancelledTaskRetrieval.java @@ -13,7 +13,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ContextConfiguration; - import pro.taskana.adapter.test.TaskanaAdapterTestApplication; import pro.taskana.common.test.security.JaasExtension; import pro.taskana.common.test.security.WithAccessId; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCompletedTaskRetrieval.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCompletedTaskRetrieval.java index db7f8469..765e6786 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCompletedTaskRetrieval.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestCompletedTaskRetrieval.java @@ -21,8 +21,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ContextConfiguration; -import uk.co.datumedge.hamcrest.json.SameJSONAs; - import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaUtilRequester; import pro.taskana.adapter.test.TaskanaAdapterTestApplication; import pro.taskana.common.test.security.JaasExtension; @@ -30,6 +28,7 @@ import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; +import uk.co.datumedge.hamcrest.json.SameJSONAs; /** * Test class to test the completion of camunda tasks upon completion of taskana tasks and vice diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestDisabledTaskClaim.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestDisabledTaskClaim.java index c2c687de..7e9ff5d2 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestDisabledTaskClaim.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestDisabledTaskClaim.java @@ -12,7 +12,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ContextConfiguration; - import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskClaimCanceler; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskClaimer; import pro.taskana.adapter.test.TaskanaAdapterTestApplication; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestFailedTaskCreation.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestFailedTaskCreation.java index c115c9a7..41740fdd 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestFailedTaskCreation.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestFailedTaskCreation.java @@ -10,7 +10,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ContextConfiguration; - import pro.taskana.adapter.camunda.outbox.rest.model.CamundaTaskEvent; import pro.taskana.adapter.test.TaskanaAdapterTestApplication; import pro.taskana.common.test.security.JaasExtension; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java index 6bd2d767..577060c8 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java @@ -27,8 +27,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ContextConfiguration; -import uk.co.datumedge.hamcrest.json.SameJSONAs; - import pro.taskana.adapter.manager.AdapterManager; import pro.taskana.adapter.systemconnector.api.SystemConnector; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaSystemConnectorImpl; @@ -42,6 +40,7 @@ import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; +import uk.co.datumedge.hamcrest.json.SameJSONAs; /** Test class to test the conversion of tasks generated by Camunda BPM to Taskana tasks. */ @SpringBootTest( diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskClaim.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskClaim.java index 29b766f0..c069af14 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskClaim.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskClaim.java @@ -16,7 +16,6 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; - import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaUtilRequester; import pro.taskana.adapter.test.TaskanaAdapterTestApplication; import pro.taskana.common.test.security.JaasExtension; diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskTermination.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskTermination.java index da038d07..79533335 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskTermination.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskTermination.java @@ -11,7 +11,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ContextConfiguration; - import pro.taskana.adapter.test.TaskanaAdapterTestApplication; import pro.taskana.common.test.security.JaasExtension; import pro.taskana.common.test.security.WithAccessId; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaSystemConnectorImpl.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaSystemConnectorImpl.java index dcc42fd8..68d3e49e 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaSystemConnectorImpl.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaSystemConnectorImpl.java @@ -1,7 +1,6 @@ package pro.taskana.adapter.systemconnector.camunda.api.impl; import java.util.List; - import pro.taskana.adapter.configuration.AdapterSpringContextProvider; import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemConnector; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimCanceler.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimCanceler.java index 996a35d3..6061be46 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimCanceler.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimCanceler.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemResponse; import pro.taskana.adapter.systemconnector.camunda.config.CamundaSystemUrls; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimer.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimer.java index 3505149c..84048204 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimer.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskClaimer.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemResponse; import pro.taskana.adapter.systemconnector.camunda.config.CamundaSystemUrls; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskCompleter.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskCompleter.java index 41ebf853..6bb3ee20 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskCompleter.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskCompleter.java @@ -9,7 +9,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemResponse; import pro.taskana.adapter.systemconnector.camunda.config.CamundaSystemUrls; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventCleaner.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventCleaner.java index c63b9279..0be87676 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventCleaner.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventCleaner.java @@ -8,7 +8,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; /** diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventErrorHandler.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventErrorHandler.java index 815ad5aa..f1b63752 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventErrorHandler.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskEventErrorHandler.java @@ -9,7 +9,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; @Component diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java index cef80eee..1da1713c 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaTaskRetriever.java @@ -15,7 +15,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.camunda.outbox.rest.CamundaTaskEvent; import pro.taskana.adapter.camunda.outbox.rest.CamundaTaskEventListResource; import pro.taskana.adapter.systemconnector.api.ReferencedTask; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaUtilRequester.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaUtilRequester.java index c7b981bb..24a9ba5b 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaUtilRequester.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/api/impl/CamundaUtilRequester.java @@ -7,7 +7,6 @@ import org.springframework.http.HttpStatus; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.camunda.config.CamundaSystemUrls; /** Util class for camunda requests used in multiple components of CamundaSystemConnectorImpl. */ diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/config/CamundaSystemConnectorConfiguration.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/config/CamundaSystemConnectorConfiguration.java index 6b6a121e..fa6aa02b 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/config/CamundaSystemConnectorConfiguration.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/config/CamundaSystemConnectorConfiguration.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskClaimCanceler; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskClaimer; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskCompleter; diff --git a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/spi/impl/SystemConnectorCamundaProviderImpl.java b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/spi/impl/SystemConnectorCamundaProviderImpl.java index 5610a64e..4d0df3a9 100644 --- a/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/spi/impl/SystemConnectorCamundaProviderImpl.java +++ b/taskana-adapter-camunda-system-connector/src/main/java/pro/taskana/adapter/systemconnector/camunda/spi/impl/SystemConnectorCamundaProviderImpl.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; - import pro.taskana.adapter.configuration.AdapterSpringContextProvider; import pro.taskana.adapter.systemconnector.api.SystemConnector; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaSystemConnectorImpl; diff --git a/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/acceptance/RetrieveCamundaTaskAccTest.java b/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/acceptance/RetrieveCamundaTaskAccTest.java index ad015f4c..4eff5c46 100644 --- a/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/acceptance/RetrieveCamundaTaskAccTest.java +++ b/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/acceptance/RetrieveCamundaTaskAccTest.java @@ -20,7 +20,6 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.client.MockRestServiceServer; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskRetriever; import pro.taskana.camunda.camundasystemconnector.configuration.CamundaConnectorTestConfiguration; diff --git a/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/configuration/CamundaConnectorTestConfiguration.java b/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/configuration/CamundaConnectorTestConfiguration.java index 2358bafa..7765f26b 100644 --- a/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/configuration/CamundaConnectorTestConfiguration.java +++ b/taskana-adapter-camunda-system-connector/src/test/java/pro/taskana/camunda/camundasystemconnector/configuration/CamundaConnectorTestConfiguration.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.client.RestTemplate; - import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskCompleter; import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaTaskRetriever; import pro.taskana.adapter.systemconnector.camunda.api.impl.HttpHeaderProvider; diff --git a/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/adapter/TaskanaAdapterWildFlyApplication.java b/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/adapter/TaskanaAdapterWildFlyApplication.java index 5f532c36..f73e650b 100644 --- a/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/adapter/TaskanaAdapterWildFlyApplication.java +++ b/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/adapter/TaskanaAdapterWildFlyApplication.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; - import pro.taskana.adapter.configuration.AdapterConfiguration; import pro.taskana.adapter.systemconnector.camunda.config.CamundaSystemConnectorConfiguration; import pro.taskana.adapter.taskanaconnector.config.TaskanaSystemConnectorConfiguration; diff --git a/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/sample/taskrouting/ExampleTaskRoutingProviderForAdapterTest.java b/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/sample/taskrouting/ExampleTaskRoutingProviderForAdapterTest.java index ef7ec0ec..9b2a27b0 100644 --- a/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/sample/taskrouting/ExampleTaskRoutingProviderForAdapterTest.java +++ b/taskana-adapter-camunda-wildfly-example/src/main/java/pro/taskana/sample/taskrouting/ExampleTaskRoutingProviderForAdapterTest.java @@ -5,7 +5,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; - import pro.taskana.common.api.TaskanaEngine; import pro.taskana.spi.routing.api.TaskRoutingProvider; import pro.taskana.task.api.models.Task; diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskInformationMapper.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskInformationMapper.java index eead4596..40c9cd7c 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskInformationMapper.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskInformationMapper.java @@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; - import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.task.api.CallbackState; import pro.taskana.task.api.TaskService; diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java index a56700a2..41c6b03d 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java @@ -9,7 +9,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - import pro.taskana.adapter.exceptions.TaskCreationFailedException; import pro.taskana.adapter.exceptions.TaskTerminationFailedException; import pro.taskana.adapter.systemconnector.api.ReferencedTask; diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java index 99790d7d..97d61769 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java @@ -14,7 +14,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Scope; - import pro.taskana.SpringTaskanaEngineConfiguration; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.classification.api.ClassificationService; diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/spi/impl/TaskanaConnectorProviderImpl.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/spi/impl/TaskanaConnectorProviderImpl.java index 91d5b3b1..d5ad1bfc 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/spi/impl/TaskanaConnectorProviderImpl.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/spi/impl/TaskanaConnectorProviderImpl.java @@ -4,7 +4,6 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.adapter.configuration.AdapterSpringContextProvider; import pro.taskana.adapter.taskanaconnector.api.TaskanaConnector; import pro.taskana.adapter.taskanaconnector.spi.TaskanaConnectorProvider; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/configuration/AdapterConfiguration.java b/taskana-adapter/src/main/java/pro/taskana/adapter/configuration/AdapterConfiguration.java index 9133f86e..95b8fc82 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/configuration/AdapterConfiguration.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/configuration/AdapterConfiguration.java @@ -7,7 +7,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Scope; import org.springframework.scheduling.annotation.EnableScheduling; - import pro.taskana.adapter.impl.ReferencedTaskClaimCanceler; import pro.taskana.adapter.impl.ReferencedTaskClaimer; import pro.taskana.adapter.impl.ReferencedTaskCompleter; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimCanceler.java b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimCanceler.java index bc2e1ae3..06b6f637 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimCanceler.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimCanceler.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - import pro.taskana.adapter.manager.AdapterManager; import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemConnector; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimer.java b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimer.java index e0797b22..2633d4d4 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimer.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskClaimer.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - import pro.taskana.adapter.manager.AdapterManager; import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemConnector; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskCompleter.java b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskCompleter.java index 74ae018e..349f16f6 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskCompleter.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/ReferencedTaskCompleter.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - import pro.taskana.adapter.manager.AdapterManager; import pro.taskana.adapter.systemconnector.api.ReferencedTask; import pro.taskana.adapter.systemconnector.api.SystemConnector; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskStarter.java b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskStarter.java index 9c3421c0..51bb8e31 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskStarter.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskStarter.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - import pro.taskana.adapter.exceptions.TaskCreationFailedException; import pro.taskana.adapter.manager.AdapterManager; import pro.taskana.adapter.systemconnector.api.ReferencedTask; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskTerminator.java b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskTerminator.java index a06ea91d..e437f10a 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskTerminator.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/TaskanaTaskTerminator.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; - import pro.taskana.adapter.exceptions.TaskTerminationFailedException; import pro.taskana.adapter.manager.AdapterManager; import pro.taskana.adapter.systemconnector.api.ReferencedTask; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/UserContext.java b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/UserContext.java index ef2c38f9..5e0e5637 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/impl/UserContext.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/impl/UserContext.java @@ -3,7 +3,6 @@ import java.security.PrivilegedAction; import java.util.function.Supplier; import javax.security.auth.Subject; - import pro.taskana.common.api.security.UserPrincipal; public class UserContext { diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/manager/AdapterManager.java b/taskana-adapter/src/main/java/pro/taskana/adapter/manager/AdapterManager.java index d3a703b0..9a62e780 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/manager/AdapterManager.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/manager/AdapterManager.java @@ -8,7 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; - import pro.taskana.adapter.systemconnector.api.SystemConnector; import pro.taskana.adapter.systemconnector.spi.SystemConnectorProvider; import pro.taskana.adapter.taskanaconnector.api.TaskanaConnector; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/systemconnector/spi/SystemConnectorProvider.java b/taskana-adapter/src/main/java/pro/taskana/adapter/systemconnector/spi/SystemConnectorProvider.java index 739bdf87..b9d7b4ce 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/systemconnector/spi/SystemConnectorProvider.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/systemconnector/spi/SystemConnectorProvider.java @@ -1,7 +1,6 @@ package pro.taskana.adapter.systemconnector.spi; import java.util.List; - import pro.taskana.adapter.systemconnector.api.SystemConnector; /** The interface for the SystemConnector provider. */ diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/api/TaskanaConnector.java b/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/api/TaskanaConnector.java index de7b6f04..56c7014e 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/api/TaskanaConnector.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/api/TaskanaConnector.java @@ -1,7 +1,6 @@ package pro.taskana.adapter.taskanaconnector.api; import java.util.List; - import pro.taskana.adapter.exceptions.TaskCreationFailedException; import pro.taskana.adapter.exceptions.TaskTerminationFailedException; import pro.taskana.adapter.systemconnector.api.ReferencedTask; diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/spi/TaskanaConnectorProvider.java b/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/spi/TaskanaConnectorProvider.java index c048c430..79768875 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/spi/TaskanaConnectorProvider.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/taskanaconnector/spi/TaskanaConnectorProvider.java @@ -1,7 +1,6 @@ package pro.taskana.adapter.taskanaconnector.spi; import java.util.List; - import pro.taskana.adapter.taskanaconnector.api.TaskanaConnector; /** The interface, a Provider for TaskanaSystemConnectors must implement. */ diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/util/Assert.java b/taskana-adapter/src/main/java/pro/taskana/adapter/util/Assert.java index a81b9053..74fc5d0e 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/util/Assert.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/util/Assert.java @@ -2,7 +2,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import pro.taskana.adapter.exceptions.AssertionViolationException; /** utility class that allows to assert specific conditions. */ From 66f8808580c293482c5fa8c8f69fbb50a1d251ed Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 14 Mar 2023 04:55:19 +0100 Subject: [PATCH 07/34] adjusted checkstyle config to match new google-java-format changes --- qa/checkstyle/checkstyle.xml | 120 +++++++++++++++++++---------------- 1 file changed, 66 insertions(+), 54 deletions(-) diff --git a/qa/checkstyle/checkstyle.xml b/qa/checkstyle/checkstyle.xml index 90a33673..306d02e9 100644 --- a/qa/checkstyle/checkstyle.xml +++ b/qa/checkstyle/checkstyle.xml @@ -30,7 +30,7 @@ + default="checkstyle-suppressions.xml"/> @@ -44,23 +44,19 @@ + value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> - - - + value="Consider using special escape sequence instead of octal value or Unicode escaped value."/> @@ -75,15 +71,15 @@ + value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> + value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/> @@ -111,8 +107,10 @@ + value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN, + LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS, + LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA, + LITERAL_YIELD, LITERAL_CASE"/> @@ -122,7 +120,7 @@ + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks + may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> @@ -143,7 +142,7 @@ @@ -159,13 +158,13 @@ - + - + @@ -178,79 +177,79 @@ + value="Package name ''{0}'' must match pattern ''{1}''."/> + value="Type name ''{0}'' must match pattern ''{1}''."/> + value="Member name ''{0}'' must match pattern ''{1}''."/> + value="Parameter name ''{0}'' must match pattern ''{1}''."/> + value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/> + value="Catch parameter name ''{0}'' must match pattern ''{1}''."/> + value="Local variable name ''{0}'' must match pattern ''{1}''."/> + value="Pattern variable name ''{0}'' must match pattern ''{1}''."/> + value="Class type name ''{0}'' must match pattern ''{1}''."/> + value="Record component name ''{0}'' must match pattern ''{1}''."/> + value="Record type name ''{0}'' must match pattern ''{1}''."/> + value="Method type name ''{0}'' must match pattern ''{1}''."/> + value="Interface type name ''{0}'' must match pattern ''{1}''."/> + value="GenericWhitespace ''{0}'' is followed by whitespace."/> + value="GenericWhitespace ''{0}'' is preceded with whitespace."/> + value="GenericWhitespace ''{0}'' should followed by whitespace."/> + value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> @@ -265,34 +264,33 @@ + - - + + value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, + LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF, + TYPE_EXTENSION_AND "/> @@ -321,14 +320,14 @@ + value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/> + value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> @@ -348,14 +347,14 @@ - + - + + value="Method name ''{0}'' must match pattern ''{1}''."/> @@ -367,8 +366,21 @@ + default="checkstyle-xpath-suppressions.xml"/> + + + + + + + + + + + + + From 40c8c53de104923c1513efe00e581c82390dc5d1 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 14 Mar 2023 04:56:39 +0100 Subject: [PATCH 08/34] aligned spring-boot-version to match TASKANA's --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b13349b..a78026f6 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.0.0-M9 3.0.0-M9 3.2.1 - 2.7.5 + 2.7.9 3.9.1.2184 3.5.11 From b370351d9aad82af01476ea9f9313a09da939c06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 05:57:01 +0000 Subject: [PATCH 09/34] Bump maven-surefire-plugin from 3.0.0-M9 to 3.0.0 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M9 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a78026f6..877c6e7d 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.11.0 3.5.0 3.0.0-M9 - 3.0.0-M9 + 3.0.0 3.2.1 2.7.9 3.9.1.2184 From 004e041f6ed9fd602da1ce78524128f88735f6c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 19:20:49 +0000 Subject: [PATCH 10/34] Bump maven-failsafe-plugin from 3.0.0-M9 to 3.0.0 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M9 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 877c6e7d..adfc5dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.2.1 3.11.0 3.5.0 - 3.0.0-M9 + 3.0.0 3.0.0 3.2.1 2.7.9 From 3f77ac5ea860f8948206c10d3af0b0ccc46a98e7 Mon Sep 17 00:00:00 2001 From: arolfes Date: Mon, 27 Feb 2023 13:07:00 +0100 Subject: [PATCH 11/34] TSK-2009: changes to immutable TaskanaConfiguration --- pom.xml | 2 +- .../src/main/resources/taskana.properties | 21 ++++------ .../src/main/resources/taskana.properties | 21 ++++------ .../integration/AbsIntegrationTest.java | 38 +++++++++++-------- .../integration/TestTaskAcquisition.java | 13 +++---- .../src/main/resources/taskana.properties | 21 ++++------ .../api/impl/TaskanaSystemConnectorImpl.java | 10 +++-- .../TaskanaSystemConnectorConfiguration.java | 27 +++++++++---- .../TaskCreationFailedException.java | 13 ++++++- .../TaskTerminationFailedException.java | 13 ++++++- 10 files changed, 103 insertions(+), 76 deletions(-) diff --git a/pom.xml b/pom.xml index adfc5dd8..e662fc8e 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 5.9.1-SNAPSHOT + 6.0.0-SNAPSHOT 10.3.4 diff --git a/taskana-adapter-camunda-spring-boot-example/src/main/resources/taskana.properties b/taskana-adapter-camunda-spring-boot-example/src/main/resources/taskana.properties index 555eaf41..fbba8d13 100644 --- a/taskana-adapter-camunda-spring-boot-example/src/main/resources/taskana.properties +++ b/taskana-adapter-camunda-spring-boot-example/src/main/resources/taskana.properties @@ -1,16 +1,11 @@ -taskana.roles.user = group1 | group2|teamlead-1 |teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2| max|elena|simone +taskana.roles.user=group1 | group2|teamlead-1 |teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2| max|elena|simone taskana.roles.Admin=name=konrad,Organisation=novatec|admin -taskana.roles.businessadmin=max|Moritz|businessadmin -taskana.roles.taskadmin=peter | taskadmin +taskana.roles.business_admin=max|Moritz|businessadmin +taskana.roles.task_admin=peter | taskadmin taskana.roles.monitor=john|teamlead_2 | monitor -taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C -taskana.classification.types=TASK,DOCUMENT -taskana.classification.categories.task= EXTERNAL, manual, autoMAtic, Process -taskana.classification.categories.document= EXTERNAL - -taskana.jobs.maxRetries=3 -taskana.jobs.batchSize=50 -taskana.jobs.cleanup.runEvery=P1D -taskana.jobs.cleanup.firstRunAt=2018-07-25T08:00:00Z -taskana.jobs.cleanup.minimumAge=P14D +taskana.domains=DOMAIN_A|DOMAIN_B|DOMAIN_C +taskana.classification.types=TASK|DOCUMENT +taskana.classification.categories.task=EXTERNAL| manual| autoMAtic| Process +taskana.classification.categories.document=EXTERNAL +taskana.jobs.enabled=false diff --git a/taskana-adapter-camunda-spring-boot-test/src/main/resources/taskana.properties b/taskana-adapter-camunda-spring-boot-test/src/main/resources/taskana.properties index 47acae02..b83e427d 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/main/resources/taskana.properties +++ b/taskana-adapter-camunda-spring-boot-test/src/main/resources/taskana.properties @@ -1,16 +1,11 @@ -taskana.roles.user = group1 | group2 | teamlead-1 | teamlead-2 | user-1-1 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | max | elena | simone +taskana.roles.user=group1 | group2 | teamlead-1 | teamlead-2 | user-1-1 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | max | elena | simone taskana.roles.admin=name=konrad,Organisation=novatec|admin -taskana.roles.businessadmin=max|Moritz|businessadmin -taskana.roles.taskadmin=peter | taskadmin +taskana.roles.business_admin=max|Moritz|businessadmin +taskana.roles.task_admin=peter | taskadmin taskana.roles.monitor=john|teamlead_2 | monitor -taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C -taskana.classification.types=TASK,DOCUMENT -taskana.classification.categories.task= EXTERNAL, manual, autoMAtic, Process -taskana.classification.categories.document= EXTERNAL - -taskana.jobs.maxRetries=3 -taskana.jobs.batchSize=50 -taskana.jobs.cleanup.runEvery=P1D -taskana.jobs.cleanup.firstRunAt=2018-07-25T08:00:00Z -taskana.jobs.cleanup.minimumAge=P14D +taskana.domains=DOMAIN_A|DOMAIN_B|DOMAIN_C +taskana.classification.types=TASK|DOCUMENT +taskana.classification.categories.task=EXTERNAL| manual| autoMAtic| Process +taskana.classification.categories.document=EXTERNAL +taskana.jobs.enabled=false diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java index 57e7383a..d786157d 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/AbsIntegrationTest.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.web.client.TestRestTemplate; -import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.TaskanaConfiguration; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.classification.api.models.Classification; @@ -80,13 +80,19 @@ public abstract class AbsIntegrationTest { public void setUp() throws Exception { // set up database connection staticly and only once. if (!isInitialised) { + String schema = + ((HikariDataSource) taskanaDataSource).getSchema() == null + ? "TASKANA" + : ((HikariDataSource) taskanaDataSource).getSchema(); // setup Taskana engine and clear Taskana database - TaskanaEngineConfiguration taskanaEngineConfiguration = - new TaskanaEngineConfiguration( - this.taskanaDataSource, false, ((HikariDataSource) taskanaDataSource).getSchema()); + TaskanaConfiguration taskanaConfiguration = + new TaskanaConfiguration.Builder(this.taskanaDataSource, false, schema) + .initTaskanaProperties() + .build(); - taskanaEngine = taskanaEngineConfiguration.buildTaskanaEngine(); - taskanaEngine.setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT); + taskanaEngine = + TaskanaEngine.buildTaskanaEngine( + taskanaConfiguration, ConnectionManagementMode.AUTOCOMMIT); DbCleaner cleaner = new DbCleaner(); cleaner.clearDb(taskanaDataSource, DbCleaner.ApplicationDatabaseType.TASKANA); @@ -116,15 +122,17 @@ public void initInfrastructure() throws Exception { // create workbaskets and classifications needed by the test cases. // since this is no testcase we cannot set a JAAS context. To be able to create workbaskets // and classifications anyway we use for this purpose an engine with security disabled ... - TaskanaEngineConfiguration taskanaEngineConfiguration = - new TaskanaEngineConfiguration( - this.taskanaDataSource, - false, - true, - ((HikariDataSource) taskanaDataSource).getSchema()); - - TaskanaEngine taskanaEngineUnsecure = taskanaEngineConfiguration.buildTaskanaEngine(); - taskanaEngineUnsecure.setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT); + String schema = + ((HikariDataSource) taskanaDataSource).getSchema() == null + ? "TASKANA" + : ((HikariDataSource) taskanaDataSource).getSchema(); + TaskanaConfiguration taskanaConfiguration = + new TaskanaConfiguration.Builder(this.taskanaDataSource, false, schema) + .initTaskanaProperties() + .build(); + + TaskanaEngine taskanaEngineUnsecure = + TaskanaEngine.buildTaskanaEngine(taskanaConfiguration, ConnectionManagementMode.AUTOCOMMIT); createWorkbasket(taskanaEngineUnsecure, "GPK_KSC", "DOMAIN_A"); createWorkbasket(taskanaEngineUnsecure, "GPK_B_KSC", "DOMAIN_B"); diff --git a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java index 577060c8..ffe55c48 100644 --- a/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java +++ b/taskana-adapter-camunda-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import java.time.Instant; import java.util.ArrayList; @@ -32,7 +31,6 @@ import pro.taskana.adapter.systemconnector.camunda.api.impl.CamundaSystemConnectorImpl; import pro.taskana.adapter.systemconnector.camunda.config.CamundaSystemUrls.SystemUrlInfo; import pro.taskana.adapter.test.TaskanaAdapterTestApplication; -import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.util.Pair; import pro.taskana.common.test.security.JaasExtension; import pro.taskana.common.test.security.WithAccessId; @@ -40,6 +38,7 @@ import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException; import uk.co.datumedge.hamcrest.json.SameJSONAs; /** Test class to test the conversion of tasks generated by Camunda BPM to Taskana tasks. */ @@ -338,7 +337,7 @@ void should_SetCustomIntegersInTaskanaTask_When_CamundaTaskHasCustomIntegers() t TaskSummary taskanaTask = taskService.createTaskQuery().externalIdIn(camundaTaskIds.get(0)).single(); - assertThat(taskanaTask.getCustomIntField(TaskCustomIntField.CUSTOM_INT_1)).isEqualTo(1); + assertThat(taskanaTask.getCustomIntField(TaskCustomIntField.CUSTOM_INT_1)).isOne(); assertThat(taskanaTask.getCustomIntField(TaskCustomIntField.CUSTOM_INT_2)).isEqualTo(2); assertThat(taskanaTask.getCustomIntField(TaskCustomIntField.CUSTOM_INT_3)).isEqualTo(3); assertThat(taskanaTask.getCustomIntField(TaskCustomIntField.CUSTOM_INT_4)).isEqualTo(4); @@ -405,7 +404,7 @@ void should_SetDefaultCustomIntegerInTaskanaTask_When_CamundaTaskHasDefaultCusto String variablesKeyString = "camunda:attribute1"; String taskanaVariablesString = taskanaTaskCustomAttributes.get(variablesKeyString); - assertTrue(taskanaVariablesString.length() > 1500000); + assertThat(taskanaVariablesString).hasSizeGreaterThan(1_500_000); } @WithAccessId( @@ -730,12 +729,12 @@ void should_SetPlannedDateInTaskanaTask_When_StartCamundaTaskWithFollowUpDate() Thread.sleep((long) (this.adapterCompletionPollingInterval * 1.2)); // Make sure we only have one Camunda Task, so we don't need a for-loop - assertThat(camundaTaskIds.size()).isEqualTo(1); + assertThat(camundaTaskIds).hasSize(1); String camundaTaskId = camundaTaskIds.get(0); // retrieve and check taskanaTaskId List taskanaTaskSummaryList = this.taskService.createTaskQuery().externalIdIn(camundaTaskId).list(); - assertThat(taskanaTaskSummaryList.size()).isEqualTo(1); + assertThat(taskanaTaskSummaryList).hasSize(1); String taskanaTaskExternalId = taskanaTaskSummaryList.get(0).getExternalId(); assertThat(taskanaTaskExternalId).isEqualTo(camundaTaskId); String taskanaTaskId = taskanaTaskSummaryList.get(0).getId(); @@ -842,7 +841,7 @@ private Map retrieveCustomAttributesFromNewTaskanaTask(String ca customAttributes = taskanaTask.getCustomAttributeMap(); return customAttributes; - } catch (TaskNotFoundException | NotAuthorizedException e) { + } catch (TaskNotFoundException | NotAuthorizedOnWorkbasketException e) { LOGGER.info( "Caught Exception while trying to retrieve custom attributes from new taskana task", e); } diff --git a/taskana-adapter-camunda-wildfly-example/src/main/resources/taskana.properties b/taskana-adapter-camunda-wildfly-example/src/main/resources/taskana.properties index 555eaf41..fbba8d13 100644 --- a/taskana-adapter-camunda-wildfly-example/src/main/resources/taskana.properties +++ b/taskana-adapter-camunda-wildfly-example/src/main/resources/taskana.properties @@ -1,16 +1,11 @@ -taskana.roles.user = group1 | group2|teamlead-1 |teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2| max|elena|simone +taskana.roles.user=group1 | group2|teamlead-1 |teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2| max|elena|simone taskana.roles.Admin=name=konrad,Organisation=novatec|admin -taskana.roles.businessadmin=max|Moritz|businessadmin -taskana.roles.taskadmin=peter | taskadmin +taskana.roles.business_admin=max|Moritz|businessadmin +taskana.roles.task_admin=peter | taskadmin taskana.roles.monitor=john|teamlead_2 | monitor -taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C -taskana.classification.types=TASK,DOCUMENT -taskana.classification.categories.task= EXTERNAL, manual, autoMAtic, Process -taskana.classification.categories.document= EXTERNAL - -taskana.jobs.maxRetries=3 -taskana.jobs.batchSize=50 -taskana.jobs.cleanup.runEvery=P1D -taskana.jobs.cleanup.firstRunAt=2018-07-25T08:00:00Z -taskana.jobs.cleanup.minimumAge=P14D +taskana.domains=DOMAIN_A|DOMAIN_B|DOMAIN_C +taskana.classification.types=TASK|DOCUMENT +taskana.classification.categories.task=EXTERNAL| manual| autoMAtic| Process +taskana.classification.categories.document=EXTERNAL +taskana.jobs.enabled=false diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java index 41c6b03d..34ab147a 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskanaSystemConnectorImpl.java @@ -19,10 +19,11 @@ import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.InvalidOwnerException; -import pro.taskana.task.api.exceptions.InvalidStateException; +import pro.taskana.task.api.exceptions.InvalidTaskStateException; import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.workbasket.api.exceptions.NotAuthorizedOnWorkbasketException; /** Implements TaskanaConnector. */ @Component @@ -155,7 +156,10 @@ public void terminateTaskanaTask(ReferencedTask referencedTask) } } catch (TaskNotFoundException e1) { LOGGER.debug("Nothing to do in terminateTaskanaTask. Task {} is already gone", taskId); - } catch (InvalidOwnerException | InvalidStateException | NotAuthorizedException e2) { + } catch (InvalidOwnerException + | NotAuthorizedException + | NotAuthorizedOnWorkbasketException + | InvalidTaskStateException e2) { if (TaskState.COMPLETED.equals(taskSummary.getState())) { LOGGER.debug("Nothing to do in terminateTaskanaTask. Task {} is already completed", taskId); } else { @@ -178,7 +182,7 @@ private List retrieveTaskanaTasksAndConvertToReferencedTasks( && callbackInfo.get(SYSTEM_URL) != null) { result.add(taskInformationMapper.convertToReferencedTask(taskanaTask)); } - } catch (TaskNotFoundException | NotAuthorizedException e) { + } catch (TaskNotFoundException | NotAuthorizedOnWorkbasketException e) { LOGGER.error("Caught {} when trying to retrieve requested taskana tasks.", e, e); } } diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java index 97d61769..95482895 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java @@ -14,8 +14,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Scope; -import pro.taskana.SpringTaskanaEngineConfiguration; -import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.TaskanaConfiguration; import pro.taskana.classification.api.ClassificationService; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.task.api.TaskService; @@ -60,15 +59,29 @@ public ClassificationService getClassificationService(TaskanaEngine taskanaEngin @Bean @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON) - public TaskanaEngine taskanaEngine(TaskanaEngineConfiguration taskanaEngineConfiguration) + public TaskanaEngine taskanaEngine(TaskanaConfiguration taskanaConfiguration) throws SQLException { - return taskanaEngineConfiguration.buildTaskanaEngine(); + return TaskanaEngine.buildTaskanaEngine(taskanaConfiguration); } @Bean @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON) - public SpringTaskanaEngineConfiguration taskanaEngineConfiguration( - @Qualifier("taskanaDataSource") DataSource taskanaDataSource) { - return new SpringTaskanaEngineConfiguration(taskanaDataSource, true, true, taskanaSchemaName); + public TaskanaConfiguration taskanaConfiguration( + @Qualifier("taskanaDataSource") DataSource taskanaDataSource, + @Qualifier("taskanaPropertiesFileName") String propertiesFileName, + @Qualifier("taskanaPropertiesDelimiter") String delimiter) { + return new TaskanaConfiguration.Builder(taskanaDataSource, true, taskanaSchemaName, true) + .initTaskanaProperties(propertiesFileName, delimiter) + .build(); + } + + @Bean + public String taskanaPropertiesFileName() { + return "/taskana.properties"; + } + + @Bean + public String taskanaPropertiesDelimiter() { + return "|"; } } diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskCreationFailedException.java b/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskCreationFailedException.java index 7fecb9eb..6f051f88 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskCreationFailedException.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskCreationFailedException.java @@ -1,8 +1,11 @@ package pro.taskana.adapter.exceptions; +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import pro.taskana.common.api.exceptions.ErrorCode; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.common.internal.util.MapCreator; /** This exception is thrown when the adapter failed to create a task in taskana. */ public class TaskCreationFailedException extends TaskanaException { @@ -13,7 +16,7 @@ public class TaskCreationFailedException extends TaskanaException { public TaskCreationFailedException(String externalId, Throwable cause) { super( String.format("Error when creating a TASKANA task with externalId '%s'", externalId), - ErrorCode.of(ERROR_KEY, MapCreator.of("task", externalId)), + ErrorCode.of(ERROR_KEY, createUnmodifiableMap("task", externalId)), cause); this.externalId = externalId; } @@ -21,4 +24,10 @@ public TaskCreationFailedException(String externalId, Throwable cause) { public String getExternalId() { return externalId; } + + private static Map createUnmodifiableMap(String key, Serializable value) { + HashMap map = new HashMap<>(); + map.put(key, ensureNullIsHandled(value)); + return Collections.unmodifiableMap(map); + } } diff --git a/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskTerminationFailedException.java b/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskTerminationFailedException.java index bd72dbfe..75cc598d 100644 --- a/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskTerminationFailedException.java +++ b/taskana-adapter/src/main/java/pro/taskana/adapter/exceptions/TaskTerminationFailedException.java @@ -1,8 +1,11 @@ package pro.taskana.adapter.exceptions; +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import pro.taskana.common.api.exceptions.ErrorCode; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.common.internal.util.MapCreator; /** This exception is thrown when the adapter failed to terminate a task in taskana. */ public class TaskTerminationFailedException extends TaskanaException { @@ -13,7 +16,7 @@ public class TaskTerminationFailedException extends TaskanaException { public TaskTerminationFailedException(String taskId, Throwable cause) { super( String.format("Task termination failed for task with id '%s'", taskId), - ErrorCode.of(ERROR_KEY, MapCreator.of("taskId", taskId)), + ErrorCode.of(ERROR_KEY, createUnmodifiableMap("taskId", taskId)), cause); this.taskId = taskId; } @@ -21,4 +24,10 @@ public TaskTerminationFailedException(String taskId, Throwable cause) { public String getTaskId() { return taskId; } + + private static Map createUnmodifiableMap(String key, Serializable value) { + HashMap map = new HashMap<>(); + map.put(key, ensureNullIsHandled(value)); + return Collections.unmodifiableMap(map); + } } From c2bd10f4d983f9c634c4f34c1c00c86dfa0ffebe Mon Sep 17 00:00:00 2001 From: arolfes Date: Mon, 27 Feb 2023 13:07:00 +0100 Subject: [PATCH 12/34] TSK-2009: changes to immutable TaskanaConfiguration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e662fc8e..1393e808 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 6.0.0-SNAPSHOT + 6.0.2 10.3.4 From 4c49f35ae4c0b5099f033e67de0ca0119c904ff4 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 24 Mar 2023 12:09:18 +0000 Subject: [PATCH 13/34] Updated poms to version 1.15.1-SNAPSHOT/6.0.3-SNAPSHOT --- camunda-outbox-example-boot/pom.xml | 2 +- ci/taskana-adapter-sonar-test-coverage/pom.xml | 2 +- pom.xml | 4 ++-- taskana-adapter-camunda-listener-example/pom.xml | 2 +- taskana-adapter-camunda-listener/pom.xml | 2 +- .../pom.xml | 2 +- taskana-adapter-camunda-outbox-rest/pom.xml | 2 +- taskana-adapter-camunda-spring-boot-example/pom.xml | 2 +- taskana-adapter-camunda-spring-boot-test/pom.xml | 2 +- taskana-adapter-camunda-system-connector/pom.xml | 2 +- taskana-adapter-camunda-wildfly-example/pom.xml | 2 +- taskana-adapter-taskana-connector/pom.xml | 2 +- taskana-adapter/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/camunda-outbox-example-boot/pom.xml b/camunda-outbox-example-boot/pom.xml index 1e6d5e90..2ee7d9a5 100644 --- a/camunda-outbox-example-boot/pom.xml +++ b/camunda-outbox-example-boot/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT diff --git a/ci/taskana-adapter-sonar-test-coverage/pom.xml b/ci/taskana-adapter-sonar-test-coverage/pom.xml index 24a0d25d..a09787c4 100644 --- a/ci/taskana-adapter-sonar-test-coverage/pom.xml +++ b/ci/taskana-adapter-sonar-test-coverage/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 1393e808..574ef99b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 6.0.2 + 6.0.3-SNAPSHOT 10.3.4 diff --git a/taskana-adapter-camunda-listener-example/pom.xml b/taskana-adapter-camunda-listener-example/pom.xml index c373540f..64eaaa75 100644 --- a/taskana-adapter-camunda-listener-example/pom.xml +++ b/taskana-adapter-camunda-listener-example/pom.xml @@ -12,7 +12,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT diff --git a/taskana-adapter-camunda-listener/pom.xml b/taskana-adapter-camunda-listener/pom.xml index 5bf8e651..ef960397 100644 --- a/taskana-adapter-camunda-listener/pom.xml +++ b/taskana-adapter-camunda-listener/pom.xml @@ -9,7 +9,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml index c7aba76b..058b2b6d 100644 --- a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml +++ b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml @@ -9,7 +9,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-outbox-rest/pom.xml b/taskana-adapter-camunda-outbox-rest/pom.xml index 9e1d6602..e190e648 100644 --- a/taskana-adapter-camunda-outbox-rest/pom.xml +++ b/taskana-adapter-camunda-outbox-rest/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-spring-boot-example/pom.xml b/taskana-adapter-camunda-spring-boot-example/pom.xml index a9cce15f..57241c39 100644 --- a/taskana-adapter-camunda-spring-boot-example/pom.xml +++ b/taskana-adapter-camunda-spring-boot-example/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-spring-boot-test/pom.xml b/taskana-adapter-camunda-spring-boot-test/pom.xml index cb1de116..19a414c3 100644 --- a/taskana-adapter-camunda-spring-boot-test/pom.xml +++ b/taskana-adapter-camunda-spring-boot-test/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-system-connector/pom.xml b/taskana-adapter-camunda-system-connector/pom.xml index 679a7ecc..7dc5f42f 100644 --- a/taskana-adapter-camunda-system-connector/pom.xml +++ b/taskana-adapter-camunda-system-connector/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-wildfly-example/pom.xml b/taskana-adapter-camunda-wildfly-example/pom.xml index cc0a7de3..f4f7b8e0 100644 --- a/taskana-adapter-camunda-wildfly-example/pom.xml +++ b/taskana-adapter-camunda-wildfly-example/pom.xml @@ -10,7 +10,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-taskana-connector/pom.xml b/taskana-adapter-taskana-connector/pom.xml index 94c857b4..08cc822e 100644 --- a/taskana-adapter-taskana-connector/pom.xml +++ b/taskana-adapter-taskana-connector/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter/pom.xml b/taskana-adapter/pom.xml index dc5cd207..8d3cf4b6 100644 --- a/taskana-adapter/pom.xml +++ b/taskana-adapter/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.14.2-SNAPSHOT + 1.15.1-SNAPSHOT ../pom.xml From 7b56a5a1f311c145fad316cc73035f4ba0c845fa Mon Sep 17 00:00:00 2001 From: Yakup Ensar Evli <54323073+ensarevlideveloper@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:14:41 +0100 Subject: [PATCH 14/34] ADPT-160: H2 Update to v2.1.214 To update H2 to 2.x we need to introduce the SET NON_KEYWORDS command. POM is adapted such that h2 is on version 2.1.214. Please not that the taskana version has to be adapted to the new taskana release. --- camunda-outbox-example-boot/pom.xml | 1 - .../src/main/resources/application.properties | 2 +- pom.xml | 3 +-- taskana-adapter-camunda-listener-example/pom.xml | 1 - .../src/main/resources/taskana-outbox.properties | 2 +- taskana-adapter-camunda-spring-boot-example/pom.xml | 1 - .../src/main/resources/application.properties | 2 +- taskana-adapter-camunda-spring-boot-test/pom.xml | 1 - .../src/main/resources/application.properties | 10 +++++----- .../src/main/resources/application.properties.h2 | 10 +++++----- .../src/main/resources/application.properties.postgres | 10 +++++----- .../src/main/resources/taskana-outbox.properties | 2 +- taskana-adapter-camunda-wildfly-example/pom.xml | 4 ++-- taskana-adapter-taskana-connector/pom.xml | 1 - 14 files changed, 22 insertions(+), 28 deletions(-) diff --git a/camunda-outbox-example-boot/pom.xml b/camunda-outbox-example-boot/pom.xml index 2ee7d9a5..3c2ca666 100644 --- a/camunda-outbox-example-boot/pom.xml +++ b/camunda-outbox-example-boot/pom.xml @@ -23,7 +23,6 @@ com.h2database h2 - ${version.h2database} runtime diff --git a/camunda-outbox-example-boot/src/main/resources/application.properties b/camunda-outbox-example-boot/src/main/resources/application.properties index a9bafd38..85579e25 100644 --- a/camunda-outbox-example-boot/src/main/resources/application.properties +++ b/camunda-outbox-example-boot/src/main/resources/application.properties @@ -15,7 +15,7 @@ camunda.bpm.database.type=h2 #spring.datasource.username = postgres #spring.datasource.password = postgres -spring.datasource.url=jdbc:h2:mem:camunda;IGNORECASE=TRUE;DB_CLOSE_ON_EXIT=FALSE; +spring.datasource.url=jdbc:h2:mem:camunda;NON_KEYWORDS=KEY,VALUE;IGNORECASE=TRUE;DB_CLOSE_ON_EXIT=FALSE; spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=sa diff --git a/pom.xml b/pom.xml index 574ef99b..3642f7be 100644 --- a/pom.xml +++ b/pom.xml @@ -60,13 +60,12 @@ 3.5.11 2.2.2 - 1.4.200 5.0.5.RELEASE 3.0.0 2.7.5 - 7.16.0 + 7.17.0 1.2 1.18.0 5.0.0.Final diff --git a/taskana-adapter-camunda-listener-example/pom.xml b/taskana-adapter-camunda-listener-example/pom.xml index 64eaaa75..6e8629ca 100644 --- a/taskana-adapter-camunda-listener-example/pom.xml +++ b/taskana-adapter-camunda-listener-example/pom.xml @@ -100,7 +100,6 @@ com.h2database h2 - ${version.h2database} test diff --git a/taskana-adapter-camunda-outbox-rest/src/main/resources/taskana-outbox.properties b/taskana-adapter-camunda-outbox-rest/src/main/resources/taskana-outbox.properties index ffee3441..3ffe44b2 100644 --- a/taskana-adapter-camunda-outbox-rest/src/main/resources/taskana-outbox.properties +++ b/taskana-adapter-camunda-outbox-rest/src/main/resources/taskana-outbox.properties @@ -12,7 +12,7 @@ taskana.adapter.outbox.duration.between.task.creation.retries = PT1H #taskana.adapter.outbox.datasource.username=postgres #taskana.adapter.outbox.datasource.password=postgres -taskana.adapter.outbox.datasource.url=jdbc:h2:mem:camunda;IGNORECASE=TRUE;LOCK_MODE=0;DB_CLOSE_ON_EXIT=FALSE; +taskana.adapter.outbox.datasource.url=jdbc:h2:mem:camunda;NON_KEYWORDS=KEY,VALUE;IGNORECASE=TRUE;LOCK_MODE=0;DB_CLOSE_ON_EXIT=FALSE; taskana.adapter.outbox.datasource.driver=org.h2.Driver taskana.adapter.outbox.datasource.username=sa taskana.adapter.outbox.datasource.password=sa diff --git a/taskana-adapter-camunda-spring-boot-example/pom.xml b/taskana-adapter-camunda-spring-boot-example/pom.xml index 57241c39..0a587147 100644 --- a/taskana-adapter-camunda-spring-boot-example/pom.xml +++ b/taskana-adapter-camunda-spring-boot-example/pom.xml @@ -59,7 +59,6 @@ com.h2database h2 - ${version.h2database} compile diff --git a/taskana-adapter-camunda-spring-boot-example/src/main/resources/application.properties b/taskana-adapter-camunda-spring-boot-example/src/main/resources/application.properties index 436035ef..9e4de140 100644 --- a/taskana-adapter-camunda-spring-boot-example/src/main/resources/application.properties +++ b/taskana-adapter-camunda-spring-boot-example/src/main/resources/application.properties @@ -39,7 +39,7 @@ taskana-system-connector-camundaSystemURLs=http://localhost:8081/example-context #################################################################################### # # Configure the datasource for Taskana DB (used by taskana-connector) -taskana.datasource.jdbcUrl = jdbc:h2:tcp://localhost:9095/mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0; +taskana.datasource.jdbcUrl = jdbc:h2:tcp://localhost:9095/mem:taskana;NON_KEYWORDS=KEY,VALUE;IGNORECASE=TRUE;LOCK_MODE=0; taskana.datasource.driverClassName = org.h2.Driver taskana.datasource.username = sa taskana.datasource.password = sa diff --git a/taskana-adapter-camunda-spring-boot-test/pom.xml b/taskana-adapter-camunda-spring-boot-test/pom.xml index 19a414c3..1a68b030 100644 --- a/taskana-adapter-camunda-spring-boot-test/pom.xml +++ b/taskana-adapter-camunda-spring-boot-test/pom.xml @@ -43,7 +43,6 @@ com.h2database h2 - ${version.h2database} test org.h2.Driver - datasource.url=jdbc:h2:mem:tca;IGNORECASE=TRUE;LOCK_MODE=0;INIT=CREATE + + datasource.url=jdbc:h2:mem:tca;NON_KEYWORDS=KEY,VALUE;IGNORECASE=TRUE;LOCK_MODE=0;INIT=CREATE SCHEMA IF NOT EXISTS TCA h2driver diff --git a/taskana-adapter-taskana-connector/pom.xml b/taskana-adapter-taskana-connector/pom.xml index 08cc822e..8e633bbc 100644 --- a/taskana-adapter-taskana-connector/pom.xml +++ b/taskana-adapter-taskana-connector/pom.xml @@ -40,7 +40,6 @@ com.h2database h2 - ${version.h2database} test From e802a7d7438adaef952d8c4bbb6ae939cca2f786 Mon Sep 17 00:00:00 2001 From: arolfes Date: Fri, 14 Apr 2023 14:28:02 +0200 Subject: [PATCH 15/34] Closes #561 : Integrate TASKANA 6.1.0, Spring 5.3.26 and Spring Boot 2.7.10 --- pom.xml | 6 +++--- taskana-adapter-camunda-listener-example/pom.xml | 5 +++++ taskana-adapter-camunda-wildfly-example/pom.xml | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3642f7be..32d8fe87 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 6.0.3-SNAPSHOT + 6.1.0 10.3.4 @@ -61,9 +61,9 @@ 3.5.11 2.2.2 - 5.0.5.RELEASE + 5.3.26.RELEASE 3.0.0 - 2.7.5 + 2.7.10 7.17.0 1.2 diff --git a/taskana-adapter-camunda-listener-example/pom.xml b/taskana-adapter-camunda-listener-example/pom.xml index 6e8629ca..f0a42397 100644 --- a/taskana-adapter-camunda-listener-example/pom.xml +++ b/taskana-adapter-camunda-listener-example/pom.xml @@ -149,6 +149,11 @@ + + maven-war-plugin + ${version.maven-war-plugin} + + diff --git a/taskana-adapter-camunda-wildfly-example/pom.xml b/taskana-adapter-camunda-wildfly-example/pom.xml index 148e8fbf..5c9a7d09 100644 --- a/taskana-adapter-camunda-wildfly-example/pom.xml +++ b/taskana-adapter-camunda-wildfly-example/pom.xml @@ -164,6 +164,10 @@ -Djboss.http.port=8089 + + maven-war-plugin + ${version.maven-war-plugin} + From 24c1c9621c4cbc3fc673036d5e4b7055820aa337 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 14 Apr 2023 14:12:20 +0000 Subject: [PATCH 16/34] Updated poms to version 1.16.1-SNAPSHOT/6.1.1-SNAPSHOT --- camunda-outbox-example-boot/pom.xml | 2 +- ci/taskana-adapter-sonar-test-coverage/pom.xml | 2 +- pom.xml | 4 ++-- taskana-adapter-camunda-listener-example/pom.xml | 2 +- taskana-adapter-camunda-listener/pom.xml | 2 +- .../pom.xml | 2 +- taskana-adapter-camunda-outbox-rest/pom.xml | 2 +- taskana-adapter-camunda-spring-boot-example/pom.xml | 2 +- taskana-adapter-camunda-spring-boot-test/pom.xml | 2 +- taskana-adapter-camunda-system-connector/pom.xml | 2 +- taskana-adapter-camunda-wildfly-example/pom.xml | 2 +- taskana-adapter-taskana-connector/pom.xml | 2 +- taskana-adapter/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/camunda-outbox-example-boot/pom.xml b/camunda-outbox-example-boot/pom.xml index 3c2ca666..b7b44be0 100644 --- a/camunda-outbox-example-boot/pom.xml +++ b/camunda-outbox-example-boot/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT diff --git a/ci/taskana-adapter-sonar-test-coverage/pom.xml b/ci/taskana-adapter-sonar-test-coverage/pom.xml index a09787c4..0fd1bb53 100644 --- a/ci/taskana-adapter-sonar-test-coverage/pom.xml +++ b/ci/taskana-adapter-sonar-test-coverage/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 32d8fe87..e223ed73 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 6.1.0 + 6.1.1-SNAPSHOT 10.3.4 diff --git a/taskana-adapter-camunda-listener-example/pom.xml b/taskana-adapter-camunda-listener-example/pom.xml index f0a42397..cf9f7443 100644 --- a/taskana-adapter-camunda-listener-example/pom.xml +++ b/taskana-adapter-camunda-listener-example/pom.xml @@ -12,7 +12,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT diff --git a/taskana-adapter-camunda-listener/pom.xml b/taskana-adapter-camunda-listener/pom.xml index ef960397..b035340f 100644 --- a/taskana-adapter-camunda-listener/pom.xml +++ b/taskana-adapter-camunda-listener/pom.xml @@ -9,7 +9,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml index 058b2b6d..bb0514fb 100644 --- a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml +++ b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml @@ -9,7 +9,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-outbox-rest/pom.xml b/taskana-adapter-camunda-outbox-rest/pom.xml index e190e648..60ca756f 100644 --- a/taskana-adapter-camunda-outbox-rest/pom.xml +++ b/taskana-adapter-camunda-outbox-rest/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-spring-boot-example/pom.xml b/taskana-adapter-camunda-spring-boot-example/pom.xml index 0a587147..128e5a96 100644 --- a/taskana-adapter-camunda-spring-boot-example/pom.xml +++ b/taskana-adapter-camunda-spring-boot-example/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-spring-boot-test/pom.xml b/taskana-adapter-camunda-spring-boot-test/pom.xml index 1a68b030..da0efcdf 100644 --- a/taskana-adapter-camunda-spring-boot-test/pom.xml +++ b/taskana-adapter-camunda-spring-boot-test/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-system-connector/pom.xml b/taskana-adapter-camunda-system-connector/pom.xml index 7dc5f42f..5934a665 100644 --- a/taskana-adapter-camunda-system-connector/pom.xml +++ b/taskana-adapter-camunda-system-connector/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-wildfly-example/pom.xml b/taskana-adapter-camunda-wildfly-example/pom.xml index 5c9a7d09..95bb718f 100644 --- a/taskana-adapter-camunda-wildfly-example/pom.xml +++ b/taskana-adapter-camunda-wildfly-example/pom.xml @@ -10,7 +10,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-taskana-connector/pom.xml b/taskana-adapter-taskana-connector/pom.xml index 8e633bbc..38457068 100644 --- a/taskana-adapter-taskana-connector/pom.xml +++ b/taskana-adapter-taskana-connector/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter/pom.xml b/taskana-adapter/pom.xml index 8d3cf4b6..6c737d44 100644 --- a/taskana-adapter/pom.xml +++ b/taskana-adapter/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.15.1-SNAPSHOT + 1.16.1-SNAPSHOT ../pom.xml From 04e830af49a0d21baf57e5260d97937341f7bd54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 04:57:32 +0000 Subject: [PATCH 17/34] Bump maven-surefire-plugin from 3.0.0 to 3.1.0 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e223ed73..cf459cea 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.11.0 3.5.0 3.0.0 - 3.0.0 + 3.1.0 3.2.1 2.7.9 3.9.1.2184 From 46680159e407ca64ff767652fe4fa568c45b4c20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 04:56:47 +0000 Subject: [PATCH 18/34] Bump maven-gpg-plugin from 3.0.1 to 3.1.0 Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0. - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf459cea..1fc59818 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 1.0.0 0.2 - 3.0.1 + 3.1.0 1.6.13 0.8.8 From cdb6360b0e333690a8e083350eaee86241e55571 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 14:17:51 +0000 Subject: [PATCH 19/34] Bump maven-checkstyle-plugin from 3.2.1 to 3.2.2 Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.1...maven-checkstyle-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fc59818..05bf8857 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.5.0 3.0.0 3.1.0 - 3.2.1 + 3.2.2 2.7.9 3.9.1.2184 From 4db6aab85336a5936bbfc90c759af4e6379ca157 Mon Sep 17 00:00:00 2001 From: Elena Mokeeva <25465835+ryzheboka@users.noreply.github.com> Date: Fri, 9 Jun 2023 08:47:02 +0200 Subject: [PATCH 20/34] Closes #574 - enable custom TaskanaConfiguration Bean (#575) --- .../config/TaskanaSystemConnectorConfiguration.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java index 95482895..d4feb39a 100644 --- a/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java +++ b/taskana-adapter-taskana-connector/src/main/java/pro/taskana/adapter/taskanaconnector/config/TaskanaSystemConnectorConfiguration.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; @@ -20,7 +21,9 @@ import pro.taskana.task.api.TaskService; import pro.taskana.workbasket.api.WorkbasketService; -/** Configuration for TASKANA task system connector. */ +/** + * Configuration for TASKANA task system connector. + */ @Configuration @DependsOn(value = {"adapterSpringContextProvider"}) public class TaskanaSystemConnectorConfiguration { @@ -65,6 +68,7 @@ public TaskanaEngine taskanaEngine(TaskanaConfiguration taskanaConfiguration) } @Bean + @ConditionalOnMissingBean(TaskanaConfiguration.class) @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON) public TaskanaConfiguration taskanaConfiguration( @Qualifier("taskanaDataSource") DataSource taskanaDataSource, From 796ac292799bcf8a975ee5a9ee1909593aa61c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Heffner?= Date: Wed, 28 Jun 2023 14:02:05 +0200 Subject: [PATCH 21/34] Closes #581 Integrate TASKANA 6.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05bf8857..37892316 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 6.1.1-SNAPSHOT + 6.2.0 10.3.4 From 241894d9205008ab9e21d6252411058eb0f67749 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:32:43 +0000 Subject: [PATCH 22/34] Bump maven-war-plugin from 3.3.2 to 3.4.0 Bumps [maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.3.2 to 3.4.0. - [Commits](https://github.com/apache/maven-war-plugin/compare/maven-war-plugin-3.3.2...maven-war-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-war-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37892316..9991e5bd 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 10.3.4 1.16.0 3.3.0 - 3.3.2 + 3.4.0 3.2.1 3.11.0 3.5.0 From 1b1d531b932e9af55321ed6d91d93f0fd03a7264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:32:57 +0000 Subject: [PATCH 23/34] Bump maven-surefire-plugin from 3.1.0 to 3.1.2 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.1.0 to 3.1.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.0...surefire-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9991e5bd..c36f1826 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.11.0 3.5.0 3.0.0 - 3.1.0 + 3.1.2 3.2.2 2.7.9 3.9.1.2184 From edf5d070b9c3f856c86dc61a68dffbae25a6f553 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:33:20 +0000 Subject: [PATCH 24/34] Bump bootstrap from 5.2.3 to 5.3.0 Bumps [bootstrap](https://github.com/webjars/bootstrap) from 5.2.3 to 5.3.0. - [Commits](https://github.com/webjars/bootstrap/compare/bootstrap-5.2.3...bootstrap-5.3.0) --- updated-dependencies: - dependency-name: org.webjars:bootstrap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c36f1826..b41357e6 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 5.0.0.Final 3.0.12.Final 2.1.1 - 5.2.3 + 5.3.0 3.0.3.Final 11.0.0.Final 4.0.0.Final From b0d46b5a579328767165efe3126d8560d62142c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:46:10 +0000 Subject: [PATCH 25/34] Bump maven-checkstyle-plugin from 3.2.2 to 3.3.0 Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.2 to 3.3.0. - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b41357e6..1cbef081 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 3.5.0 3.0.0 3.1.2 - 3.2.2 + 3.3.0 2.7.9 3.9.1.2184 From 9cf99dc7ccf1ad6a3a90c1d01cee90a20f759bc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:46:29 +0000 Subject: [PATCH 26/34] Bump maven-source-plugin from 3.2.1 to 3.3.0 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0. - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1cbef081..c6ed6d52 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 1.16.0 3.3.0 3.4.0 - 3.2.1 + 3.3.0 3.11.0 3.5.0 3.0.0 From f3b6aed67c42454b3b220b3df53aebde02d04224 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:54:14 +0000 Subject: [PATCH 27/34] Bump maven-failsafe-plugin from 3.0.0 to 3.1.2 Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0 to 3.1.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6ed6d52..b4a45090 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 3.3.0 3.11.0 3.5.0 - 3.0.0 + 3.1.2 3.1.2 3.3.0 2.7.9 From 7a2a4d17e07a1baa93a050557b8ecc2ce0a14acf Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:55:12 +0000 Subject: [PATCH 28/34] Updated poms to version 1.17.1-SNAPSHOT/6.2.1-SNAPSHOT --- camunda-outbox-example-boot/pom.xml | 2 +- ci/taskana-adapter-sonar-test-coverage/pom.xml | 2 +- pom.xml | 4 ++-- taskana-adapter-camunda-listener-example/pom.xml | 2 +- taskana-adapter-camunda-listener/pom.xml | 2 +- .../pom.xml | 2 +- taskana-adapter-camunda-outbox-rest/pom.xml | 2 +- taskana-adapter-camunda-spring-boot-example/pom.xml | 2 +- taskana-adapter-camunda-spring-boot-test/pom.xml | 2 +- taskana-adapter-camunda-system-connector/pom.xml | 2 +- taskana-adapter-camunda-wildfly-example/pom.xml | 2 +- taskana-adapter-taskana-connector/pom.xml | 2 +- taskana-adapter/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/camunda-outbox-example-boot/pom.xml b/camunda-outbox-example-boot/pom.xml index b7b44be0..ce89465f 100644 --- a/camunda-outbox-example-boot/pom.xml +++ b/camunda-outbox-example-boot/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT diff --git a/ci/taskana-adapter-sonar-test-coverage/pom.xml b/ci/taskana-adapter-sonar-test-coverage/pom.xml index 0fd1bb53..640c9c58 100644 --- a/ci/taskana-adapter-sonar-test-coverage/pom.xml +++ b/ci/taskana-adapter-sonar-test-coverage/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index b4a45090..549a48ad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 6.2.0 + 6.2.1-SNAPSHOT 10.3.4 diff --git a/taskana-adapter-camunda-listener-example/pom.xml b/taskana-adapter-camunda-listener-example/pom.xml index cf9f7443..a7adc2f9 100644 --- a/taskana-adapter-camunda-listener-example/pom.xml +++ b/taskana-adapter-camunda-listener-example/pom.xml @@ -12,7 +12,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT diff --git a/taskana-adapter-camunda-listener/pom.xml b/taskana-adapter-camunda-listener/pom.xml index b035340f..59d5f50b 100644 --- a/taskana-adapter-camunda-listener/pom.xml +++ b/taskana-adapter-camunda-listener/pom.xml @@ -9,7 +9,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml index bb0514fb..5ffefac5 100644 --- a/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml +++ b/taskana-adapter-camunda-outbox-rest-spring-boot-starter/pom.xml @@ -9,7 +9,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-outbox-rest/pom.xml b/taskana-adapter-camunda-outbox-rest/pom.xml index 60ca756f..ac5a47e6 100644 --- a/taskana-adapter-camunda-outbox-rest/pom.xml +++ b/taskana-adapter-camunda-outbox-rest/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-spring-boot-example/pom.xml b/taskana-adapter-camunda-spring-boot-example/pom.xml index 128e5a96..c69dcc84 100644 --- a/taskana-adapter-camunda-spring-boot-example/pom.xml +++ b/taskana-adapter-camunda-spring-boot-example/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-spring-boot-test/pom.xml b/taskana-adapter-camunda-spring-boot-test/pom.xml index da0efcdf..f1e38175 100644 --- a/taskana-adapter-camunda-spring-boot-test/pom.xml +++ b/taskana-adapter-camunda-spring-boot-test/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-system-connector/pom.xml b/taskana-adapter-camunda-system-connector/pom.xml index 5934a665..a39822ba 100644 --- a/taskana-adapter-camunda-system-connector/pom.xml +++ b/taskana-adapter-camunda-system-connector/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-camunda-wildfly-example/pom.xml b/taskana-adapter-camunda-wildfly-example/pom.xml index 95bb718f..deec4907 100644 --- a/taskana-adapter-camunda-wildfly-example/pom.xml +++ b/taskana-adapter-camunda-wildfly-example/pom.xml @@ -10,7 +10,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter-taskana-connector/pom.xml b/taskana-adapter-taskana-connector/pom.xml index 38457068..40f181e2 100644 --- a/taskana-adapter-taskana-connector/pom.xml +++ b/taskana-adapter-taskana-connector/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml diff --git a/taskana-adapter/pom.xml b/taskana-adapter/pom.xml index 6c737d44..f88a14b5 100644 --- a/taskana-adapter/pom.xml +++ b/taskana-adapter/pom.xml @@ -11,7 +11,7 @@ pro.taskana taskana-adapter-parent - 1.16.1-SNAPSHOT + 1.17.1-SNAPSHOT ../pom.xml From d9954d080a303202685504da6a917a2886f4ddd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 04:57:30 +0000 Subject: [PATCH 29/34] Bump mybatis from 3.5.11 to 3.5.13 Bumps [mybatis](https://github.com/mybatis/mybatis-3) from 3.5.11 to 3.5.13. - [Release notes](https://github.com/mybatis/mybatis-3/releases) - [Commits](https://github.com/mybatis/mybatis-3/compare/mybatis-3.5.11...mybatis-3.5.13) --- updated-dependencies: - dependency-name: org.mybatis:mybatis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 549a48ad..ba001ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 2.7.9 3.9.1.2184 - 3.5.11 + 3.5.13 2.2.2 5.3.26.RELEASE From 73fdc5933b37a0b7fdc67af96652067bd0553748 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 04:57:25 +0000 Subject: [PATCH 30/34] Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba001ae6..1fc055b0 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ 3.1.0 1.6.13 - 0.8.8 + 0.8.9 From 364ba06c4d417671b8a2d3de0f22fc845da7d69b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 04:58:28 +0000 Subject: [PATCH 31/34] Bump jackson-databind from 2.13.4 to 2.14.2 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4 to 2.14.2. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- taskana-adapter-camunda-listener/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskana-adapter-camunda-listener/pom.xml b/taskana-adapter-camunda-listener/pom.xml index 59d5f50b..aad58823 100644 --- a/taskana-adapter-camunda-listener/pom.xml +++ b/taskana-adapter-camunda-listener/pom.xml @@ -22,7 +22,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4 + 2.14.2 org.mybatis From 1ae807678658e8fe33b327efcd1d79083f82b790 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 04:57:58 +0000 Subject: [PATCH 32/34] Bump checkstyle from 10.3.4 to 10.9.3 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.3.4 to 10.9.3. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.3.4...checkstyle-10.9.3) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fc055b0..2890a310 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 6.2.1-SNAPSHOT - 10.3.4 + 10.9.3 1.16.0 3.3.0 3.4.0 From 153c1f1aca3696d2a2fb04ab1ad0b943cd3ac1af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 04:57:46 +0000 Subject: [PATCH 33/34] Bump archunit from 1.0.0 to 1.0.1 Bumps [archunit](https://github.com/TNG/ArchUnit) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/TNG/ArchUnit/releases) - [Commits](https://github.com/TNG/ArchUnit/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: com.tngtech.archunit:archunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2890a310..cfbf81d1 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 4.0.0.Final 7.9.Final - 1.0.0 + 1.0.1 0.2 3.1.0 From 7514c699c68a629f1368103be55fe191a7a83a9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 04:57:11 +0000 Subject: [PATCH 34/34] Bump version.camunda.spin from 1.18.0 to 1.19.1 Bumps `version.camunda.spin` from 1.18.0 to 1.19.1. Updates `camunda-spin-dataformat-all` from 1.18.0 to 1.19.1 - [Release notes](https://github.com/camunda/camunda-spin/releases) - [Commits](https://github.com/camunda/camunda-spin/compare/1.18.0...1.19.1) Updates `camunda-spin-bom` from 1.18.0 to 1.19.1 - [Release notes](https://github.com/camunda/camunda-spin/releases) - [Commits](https://github.com/camunda/camunda-spin/compare/1.18.0...1.19.1) Updates `camunda-spin-core` from 1.18.0 to 1.19.1 - [Release notes](https://github.com/camunda/camunda-spin/releases) - [Commits](https://github.com/camunda/camunda-spin/compare/1.18.0...1.19.1) Updates `camunda-spin-dataformat-json-jackson` from 1.18.0 to 1.19.1 - [Release notes](https://github.com/camunda/camunda-spin/releases) - [Commits](https://github.com/camunda/camunda-spin/compare/1.18.0...1.19.1) --- updated-dependencies: - dependency-name: org.camunda.spin:camunda-spin-dataformat-all dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.camunda.spin:camunda-spin-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.camunda.spin:camunda-spin-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.camunda.spin:camunda-spin-dataformat-json-jackson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cfbf81d1..4585b0c6 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 7.17.0 1.2 - 1.18.0 + 1.19.1 5.0.0.Final 3.0.12.Final 2.1.1