From 65c9db992f4fc93c386713080743557b589250d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 14:12:20 +0000 Subject: [PATCH 1/4] build(deps): bump connector-runtime-bundle from 0.18.2 to 0.20.0 Bumps connector-runtime-bundle from 0.18.2 to 0.20.0. --- updated-dependencies: - dependency-name: io.camunda.connector:connector-runtime-bundle 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 22f71b6..804c5eb 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.2.0 1.4.0 8.2.2 - 0.18.2 + 0.20.0 0.9.0 1.8.22 From 470970dcae9d95c7ff13b20cdfe90d2ea127d957 Mon Sep 17 00:00:00 2001 From: Philipp Ossler Date: Tue, 13 Jun 2023 08:55:45 +0200 Subject: [PATCH 2/4] build: switch to spring-boot-starter-camunda-connectors Replace the dependency to `spring-zeebe-starter` and to the camunda connector artifacts by the new recommended `spring-boot-starter-camunda-connectors` in version `0.20.0`. --- pom.xml | 63 +++++++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 804c5eb..a6ca039 100644 --- a/pom.xml +++ b/pom.xml @@ -23,9 +23,7 @@ 2.9.0 1.2.0 1.4.0 - 8.2.2 0.20.0 - 0.9.0 1.8.22 2.7.12 @@ -75,21 +73,9 @@ - io.camunda - spring-zeebe-starter - ${spring-zeebe.version} - - - - org.camunda.community - eze - ${eze.version} - - - - io.zeebe.hazelcast - zeebe-hazelcast-exporter - ${hazelcast.version} + io.camunda.connector + spring-boot-starter-camunda-connectors + ${camunda-connector-bundle.version} @@ -99,15 +85,15 @@ - io.camunda.connector - connector-runtime-util - ${camunda-connector-sdk.version} + org.camunda.community + eze + ${eze.version} - io.camunda.connector - connector-validation - ${camunda-connector-sdk.version} + io.zeebe.hazelcast + zeebe-hazelcast-exporter + ${hazelcast.version} @@ -221,10 +207,15 @@ - io.camunda - spring-zeebe-starter + io.camunda.connector + spring-boot-starter-camunda-connectors + + io.camunda.connector + connector-runtime-bundle + + org.camunda.community eze @@ -241,28 +232,6 @@ zeebe-hazelcast-exporter - - io.camunda.connector - connector-runtime-bundle - - - - io.camunda - spring-zeebe-connector-runtime - - - - - - io.camunda.connector - connector-runtime-util - - - - io.camunda.connector - connector-validation - - From c54be2289b9f6e20a52ca6a8d2daeeaca3bbf45d Mon Sep 17 00:00:00 2001 From: Philipp Ossler Date: Tue, 13 Jun 2023 08:56:22 +0200 Subject: [PATCH 3/4] refactor: adjust the imports to the connectors starter --- .../community/zeebe/play/connectors/ConnectorService.kt | 2 +- .../community/zeebe/play/connectors/ConnectorsConfig.kt | 4 ++-- .../camunda/community/zeebe/play/rest/ConnectorsResource.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorService.kt b/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorService.kt index 20bab1c..3a25a43 100644 --- a/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorService.kt +++ b/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorService.kt @@ -1,7 +1,7 @@ package org.camunda.community.zeebe.play.connectors import io.camunda.connector.impl.outbound.OutboundConnectorConfiguration -import io.camunda.connector.runtime.util.discovery.SPIConnectorDiscovery +import io.camunda.connector.runtime.core.discovery.SPIConnectorDiscovery import io.camunda.zeebe.model.bpmn.Bpmn import io.camunda.zeebe.model.bpmn.BpmnModelInstance import io.camunda.zeebe.model.bpmn.instance.zeebe.ZeebeInput diff --git a/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorsConfig.kt b/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorsConfig.kt index a36ebce..0cbc480 100644 --- a/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorsConfig.kt +++ b/src/main/kotlin/org/camunda/community/zeebe/play/connectors/ConnectorsConfig.kt @@ -1,8 +1,8 @@ package org.camunda.community.zeebe.play.connectors import io.camunda.connector.api.secret.SecretProvider -import io.camunda.connector.runtime.util.ConnectorHelper -import io.camunda.connector.runtime.util.outbound.ConnectorJobHandler +import io.camunda.connector.runtime.core.ConnectorHelper +import io.camunda.connector.runtime.core.outbound.ConnectorJobHandler import io.camunda.zeebe.client.ZeebeClient import org.slf4j.LoggerFactory import org.springframework.boot.autoconfigure.domain.EntityScan diff --git a/src/main/kotlin/org/camunda/community/zeebe/play/rest/ConnectorsResource.kt b/src/main/kotlin/org/camunda/community/zeebe/play/rest/ConnectorsResource.kt index 91525f9..8668758 100644 --- a/src/main/kotlin/org/camunda/community/zeebe/play/rest/ConnectorsResource.kt +++ b/src/main/kotlin/org/camunda/community/zeebe/play/rest/ConnectorsResource.kt @@ -3,8 +3,8 @@ package org.camunda.community.zeebe.play.rest import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.ObjectMapper import io.camunda.connector.impl.outbound.OutboundConnectorConfiguration -import io.camunda.connector.runtime.util.ConnectorHelper -import io.camunda.connector.runtime.util.outbound.ConnectorJobHandler +import io.camunda.connector.runtime.core.ConnectorHelper +import io.camunda.connector.runtime.core.outbound.ConnectorJobHandler import io.camunda.zeebe.client.ZeebeClient import io.camunda.zeebe.client.api.response.ActivatedJob import io.camunda.zeebe.model.bpmn.Bpmn From b5d7f2837e2b16897e24d858cc09ca83f9ceda3c Mon Sep 17 00:00:00 2001 From: Philipp Ossler Date: Tue, 13 Jun 2023 08:57:05 +0200 Subject: [PATCH 4/4] fix: disable the outbound and inbound connectors --- .../camunda/community/zeebe/play/ZeebePlayApplication.kt | 3 ++- src/main/resources/application.yml | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/org/camunda/community/zeebe/play/ZeebePlayApplication.kt b/src/main/kotlin/org/camunda/community/zeebe/play/ZeebePlayApplication.kt index 41286ed..a6bca1e 100644 --- a/src/main/kotlin/org/camunda/community/zeebe/play/ZeebePlayApplication.kt +++ b/src/main/kotlin/org/camunda/community/zeebe/play/ZeebePlayApplication.kt @@ -1,6 +1,7 @@ package org.camunda.community.zeebe.play +import io.camunda.connector.runtime.OutboundConnectorsAutoConfiguration import io.zeebe.zeeqs.importer.hazelcast.HazelcastImporter import io.zeebe.zeeqs.importer.hazelcast.HazelcastProperties import org.camunda.community.zeebe.play.zeebe.ZeebeService @@ -12,7 +13,7 @@ import javax.annotation.PostConstruct import javax.annotation.PreDestroy -@SpringBootApplication +@SpringBootApplication(exclude = [OutboundConnectorsAutoConfiguration::class]) @EnableSpringDataWebSupport open class ZeebePlayApplication( val hazelcastProperties: HazelcastProperties, diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5fa1a9e..d67e5aa 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -32,6 +32,14 @@ zeebe: # - name: SLACK_OAUTH_TOKEN # value: my-slack-oauth-token +camunda: + # disable inbound connector + connector: + polling: + enabled: false + webhook: + enabled: false + spring: datasource: url: jdbc:h2:mem:zeeqs;DB_CLOSE_DELAY=-1