From f137db26373da2f66ed34eeb3428e6d7baf6ab7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 23:11:33 +0000 Subject: [PATCH 1/7] Bump camunda.version from 7.21.0 to 7.22.0 Bumps `camunda.version` from 7.21.0 to 7.22.0. Updates `org.camunda.bpm:camunda-engine` from 7.21.0 to 7.22.0 Updates `org.camunda.bpm:camunda-bpm-assert` from 7.21.0 to 7.22.0 Updates `org.camunda.bpm:camunda-bpm-junit5` from 7.21.0 to 7.22.0 Updates `org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-webapp` from 7.21.0 to 7.22.0 Updates `org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-test` from 7.21.0 to 7.22.0 --- updated-dependencies: - dependency-name: org.camunda.bpm:camunda-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.camunda.bpm:camunda-bpm-assert dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.camunda.bpm:camunda-bpm-junit5 dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-webapp dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-test 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 63f7172..9e050ad 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - 7.21.0 + 7.22.0 1.3.1 3.26.3 1.3.1.0 From 9f6f22392832016d2027f6c8ea01bf95175dd066 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 09:49:13 +0000 Subject: [PATCH 2/7] Bump org.camunda.community.mockito:camunda-platform-7-mockito Bumps [org.camunda.community.mockito:camunda-platform-7-mockito](https://github.com/camunda-community-hub/camunda-platform-7-mockito) from 7.21.0 to 7.22.0. - [Release notes](https://github.com/camunda-community-hub/camunda-platform-7-mockito/releases) - [Commits](https://github.com/camunda-community-hub/camunda-platform-7-mockito/compare/7.21.0...7.22.0) --- updated-dependencies: - dependency-name: org.camunda.community.mockito:camunda-platform-7-mockito dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- examples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pom.xml b/examples/pom.xml index 8d93a17..b0e3f8b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -15,7 +15,7 @@ 3.3.4 2.7.0 - 7.21.0 + 7.22.0 4.13.2 From ee5dd8f1c564fe3d6d6ae2a6dae0d77c7c92766e Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 8 Oct 2024 12:23:23 +0200 Subject: [PATCH 3/7] Update for next development version --- examples/basic-junit4/pom.xml | 2 +- examples/basic-junit5/pom.xml | 2 +- examples/pom.xml | 2 +- extension/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/basic-junit4/pom.xml b/examples/basic-junit4/pom.xml index cbd0086..cc18de5 100644 --- a/examples/basic-junit4/pom.xml +++ b/examples/basic-junit4/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-examples - 1.21.1 + 1.21.2-SNAPSHOT camunda-bpm-jgiven-examples-basic-junit4 diff --git a/examples/basic-junit5/pom.xml b/examples/basic-junit5/pom.xml index 142ceaa..212a7c7 100644 --- a/examples/basic-junit5/pom.xml +++ b/examples/basic-junit5/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-examples - 1.21.1 + 1.21.2-SNAPSHOT camunda-bpm-jgiven-examples-basic-junit5 diff --git a/examples/pom.xml b/examples/pom.xml index c92cccb..817aeeb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.21.1 + 1.21.2-SNAPSHOT camunda-bpm-jgiven-examples diff --git a/extension/pom.xml b/extension/pom.xml index 28a7d42..4adbe25 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.21.1 + 1.21.2-SNAPSHOT camunda-bpm-jgiven diff --git a/pom.xml b/pom.xml index 0d3eec5..cbdb28d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.21.1 + 1.21.2-SNAPSHOT pom From 47475eace0d05344e739b0bed33798f2feed8752 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 8 Oct 2024 12:59:53 +0200 Subject: [PATCH 4/7] remove settings obsolete in 7.22 --- .../holunda/testing/examples/basic/junit5/TestProcessEngine.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/basic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/TestProcessEngine.kt b/examples/basic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/TestProcessEngine.kt index 7d8a99e..3816deb 100644 --- a/examples/basic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/TestProcessEngine.kt +++ b/examples/basic-junit5/src/test/kotlin/io/holunda/testing/examples/basic/junit5/TestProcessEngine.kt @@ -35,8 +35,6 @@ object TestProcessEngine { configuration.isJobExecutorActivate = false configuration.isDbMetricsReporterActivate = false configuration.expressionManager = MockExpressionManager() - configuration.isTelemetryReporterActivate = false - configuration.isInitializeTelemetry = false } /** From 40d39f8580acc9d45b5ef6cd78d965c2424986d1 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 8 Oct 2024 13:06:47 +0200 Subject: [PATCH 5/7] minor formatting and quoting in the output, killed some more codacy warnings --- .../examples/basic/ApprovalProcessBean.kt | 3 +++ .../examples/basic/ApprovalProcessBean.kt | 3 +++ .../camunda/bpm/extension/jgiven/ProcessStage.kt | 16 +++------------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/examples/basic-junit4/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt b/examples/basic-junit4/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt index 42d5675..66ce90e 100644 --- a/examples/basic-junit4/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt +++ b/examples/basic-junit4/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt @@ -11,6 +11,9 @@ class ApprovalProcessBean( private val processEngine: ProcessEngine ) : Supplier { + /** + * Main attributes. + */ companion object { const val KEY = "approval" const val RESOURCE = "approval.bpmn" diff --git a/examples/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt b/examples/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt index 3b8a834..980b596 100644 --- a/examples/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt +++ b/examples/basic-junit5/src/main/kotlin/io/holunda/testing/examples/basic/ApprovalProcessBean.kt @@ -11,6 +11,9 @@ class ApprovalProcessBean( private val processEngine: ProcessEngine ) : Supplier { + /** + * Main attributes. + */ companion object { const val KEY = "approval" const val RESOURCE = "approval.bpmn" diff --git a/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt b/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt index b48c457..3df6597 100644 --- a/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt +++ b/extension/src/main/kotlin/io/holunda/camunda/bpm/extension/jgiven/ProcessStage.kt @@ -139,8 +139,8 @@ class ProcessStage, PROCESS_BEAN : Suppl * @param activityId activities the execution is waiting at. * @return fluent stage. */ - @As("process continues") - fun process_continues(vararg activityId: String) = job_is_executed(*activityId) + @As("process continues with activities $") + fun process_continues(@QuotedVarargs vararg activityId: String) = job_is_executed(*activityId) /** @@ -382,7 +382,7 @@ class ProcessStage, PROCESS_BEAN : Suppl * @param activityId id of the activity the job is waiting in. * @return fluent stage. */ - fun job_is_executed(vararg activityId: String) = step { + fun job_is_executed(@QuotedVarargs vararg activityId: String) = step { require(activityId.isNotEmpty()) { "At least one activity id must be provided" } activityId.map { val job = job(it) @@ -456,16 +456,6 @@ class ProcessStage, PROCESS_BEAN : Suppl assertThat(externalTasks).isNotEmpty } - - /** - * Completes external task. - * - * @param topicName name of the topic. - * @param workerName optional, defaults to `test-worker` - * @param variables variables to set on completion, optional, defaults to empty map. - * @param isAsyncAfter executes the async job after completion, optional, defaults to `false`. - * @return fluent stage. - */ private fun externalTaskIsCompleted( topicName: String, workerName: String = "test-worker", From 7256e29e041dc424b5da7026cb80bf78f6ab8caa Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 8 Oct 2024 13:14:32 +0200 Subject: [PATCH 6/7] Update versions for release --- examples/basic-junit4/pom.xml | 2 +- examples/basic-junit5/pom.xml | 2 +- examples/pom.xml | 2 +- extension/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/basic-junit4/pom.xml b/examples/basic-junit4/pom.xml index cc18de5..762ebf1 100644 --- a/examples/basic-junit4/pom.xml +++ b/examples/basic-junit4/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-examples - 1.21.2-SNAPSHOT + 1.22.0-SNAPSHOT camunda-bpm-jgiven-examples-basic-junit4 diff --git a/examples/basic-junit5/pom.xml b/examples/basic-junit5/pom.xml index 212a7c7..6a2d239 100644 --- a/examples/basic-junit5/pom.xml +++ b/examples/basic-junit5/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-examples - 1.21.2-SNAPSHOT + 1.22.0-SNAPSHOT camunda-bpm-jgiven-examples-basic-junit5 diff --git a/examples/pom.xml b/examples/pom.xml index d53c804..f77802c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.21.2-SNAPSHOT + 1.22.0-SNAPSHOT camunda-bpm-jgiven-examples diff --git a/extension/pom.xml b/extension/pom.xml index 4adbe25..3a29b28 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.21.2-SNAPSHOT + 1.22.0-SNAPSHOT camunda-bpm-jgiven diff --git a/pom.xml b/pom.xml index 821333f..98d6077 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.21.2-SNAPSHOT + 1.22.0-SNAPSHOT pom From 4a36865ad47f2028371376c575457d79a3cdfbdc Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Tue, 8 Oct 2024 13:15:09 +0200 Subject: [PATCH 7/7] Update for next development version --- examples/basic-junit4/pom.xml | 2 +- examples/basic-junit5/pom.xml | 2 +- examples/pom.xml | 2 +- extension/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/basic-junit4/pom.xml b/examples/basic-junit4/pom.xml index 762ebf1..d780fab 100644 --- a/examples/basic-junit4/pom.xml +++ b/examples/basic-junit4/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-examples - 1.22.0-SNAPSHOT + 1.22.0 camunda-bpm-jgiven-examples-basic-junit4 diff --git a/examples/basic-junit5/pom.xml b/examples/basic-junit5/pom.xml index 6a2d239..74602d7 100644 --- a/examples/basic-junit5/pom.xml +++ b/examples/basic-junit5/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-examples - 1.22.0-SNAPSHOT + 1.22.0 camunda-bpm-jgiven-examples-basic-junit5 diff --git a/examples/pom.xml b/examples/pom.xml index f77802c..1528f37 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.22.0-SNAPSHOT + 1.22.0 camunda-bpm-jgiven-examples diff --git a/extension/pom.xml b/extension/pom.xml index 3a29b28..ff863ea 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -6,7 +6,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.22.0-SNAPSHOT + 1.22.0 camunda-bpm-jgiven diff --git a/pom.xml b/pom.xml index 98d6077..a5af98c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.holunda.testing camunda-bpm-jgiven-parent - 1.22.0-SNAPSHOT + 1.22.0 pom