From 65005138bd6ebcb2664002e56eed51addd1b30d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:11:33 +0000 Subject: [PATCH 01/40] chore(deps): bump hazelcast from 5.2.3 to 5.3.0 Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.3 to 5.3.0. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.3...v5.3.0) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8dc2f5d..c342e67b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 2.7.5 - 5.2.3 + 5.3.0 17 From cf31913781c3de7cfefdbd5ae51253e227c79fee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:11:38 +0000 Subject: [PATCH 02/40] chore(deps): bump popper.js from 1.16.1-lts to 2.9.3 Bumps [popper.js](https://github.com/webjars/popper.js) from 1.16.1-lts to 2.9.3. - [Commits](https://github.com/webjars/popper.js/compare/popper.js-1.16.1-lts...popper.js-2.9.3) --- updated-dependencies: - dependency-name: org.webjars:popper.js dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8dc2f5d..da96da02 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.webjars popper.js - 1.16.1-lts + 2.9.3 org.webjars From b5fe7f22ddc22cf3fb371447af555d29115b5d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:11:43 +0000 Subject: [PATCH 03/40] chore(deps-dev): bump mysql from 1.18.1 to 1.18.3 Bumps [mysql](https://github.com/testcontainers/testcontainers-java) from 1.18.1 to 1.18.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.1...1.18.3) --- updated-dependencies: - dependency-name: org.testcontainers:mysql 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 c8dc2f5d..afcd7ff1 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ org.testcontainers mysql - 1.18.1 + 1.18.3 test From 420d425c007e6582f881eb463dc3692789252410 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:11:45 +0000 Subject: [PATCH 04/40] chore(deps): bump maven-bundle-plugin from 5.1.8 to 5.1.9 Bumps maven-bundle-plugin from 5.1.8 to 5.1.9. --- updated-dependencies: - dependency-name: org.apache.felix:maven-bundle-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 c8dc2f5d..b813e928 100644 --- a/pom.xml +++ b/pom.xml @@ -373,7 +373,7 @@ org.apache.felix maven-bundle-plugin - 5.1.8 + 5.1.9 bundle-manifest From a786b2809f244290d440aabb7ee77d3b06d941b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:12:03 +0000 Subject: [PATCH 05/40] chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.5.0 to 3.6.0. - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.5.0...maven-dependency-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-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 c8dc2f5d..89ec5c59 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 copy From d8c900064416a8304975de5cc48963510359c923 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:12:08 +0000 Subject: [PATCH 06/40] chore(deps-dev): bump postgresql from 1.18.1 to 1.18.3 Bumps [postgresql](https://github.com/testcontainers/testcontainers-java) from 1.18.1 to 1.18.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.1...1.18.3) --- updated-dependencies: - dependency-name: org.testcontainers:postgresql 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 c8dc2f5d..7776a535 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ org.testcontainers postgresql - 1.18.1 + 1.18.3 test From 16c31dca4f46b2f00dc3c31b3454d8de790549d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:12:13 +0000 Subject: [PATCH 07/40] chore(deps): bump maven-project-info-reports-plugin from 3.4.3 to 3.4.4 Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.4.3 to 3.4.4. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.4.3...maven-project-info-reports-plugin-3.4.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-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 c8dc2f5d..0416f218 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.3 + 3.4.4 org.sonatype.plugins From 0a31639612f3ae124f9840421db84f5049da54c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:12:18 +0000 Subject: [PATCH 08/40] chore(deps): 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 c8dc2f5d..810aea16 100644 --- a/pom.xml +++ b/pom.xml @@ -405,7 +405,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts From 36e179a116e5e7b96c178560e52396238e8a4a73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:12:30 +0000 Subject: [PATCH 09/40] chore(deps): bump spring-zeebe-starter from 8.2.0 to 8.2.2 Bumps spring-zeebe-starter from 8.2.0 to 8.2.2. --- updated-dependencies: - dependency-name: io.camunda:spring-zeebe-starter 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 c8dc2f5d..be90fcd0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ UTF-8 8.2.4 - 8.2.0 + 8.2.2 1.2.1 2.7.5 From 4e8165bac623070e8226314655b2e6b95e0d4258 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 10:14:28 +0000 Subject: [PATCH 10/40] chore(deps): bump zeebe-bom from 8.2.4 to 8.2.5 Bumps [zeebe-bom](https://github.com/camunda/zeebe) from 8.2.4 to 8.2.5. - [Release notes](https://github.com/camunda/zeebe/releases) - [Commits](https://github.com/camunda/zeebe/compare/8.2.4...8.2.5) --- updated-dependencies: - dependency-name: io.camunda:zeebe-bom 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 be90fcd0..ea873b62 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 - 8.2.4 + 8.2.5 8.2.2 1.2.1 From 60ed06324bf830e6657bcb9d558efe2ba4d52f4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:07:56 +0000 Subject: [PATCH 11/40] chore(deps): bump jib-maven-plugin from 3.3.1 to 3.3.2 Bumps [jib-maven-plugin](https://github.com/GoogleContainerTools/jib) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/GoogleContainerTools/jib/releases) - [Commits](https://github.com/GoogleContainerTools/jib/commits) --- updated-dependencies: - dependency-name: com.google.cloud.tools:jib-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 e4b915d3..89aecd98 100644 --- a/pom.xml +++ b/pom.xml @@ -309,7 +309,7 @@ com.google.cloud.tools jib-maven-plugin - 3.3.1 + 3.3.2 deploy From d6d306f24fa41cabf87d73310fa1e8169acd835d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:08:01 +0000 Subject: [PATCH 12/40] chore(deps): bump bootstrap from 4.6.2 to 5.3.0 Bumps [bootstrap](https://github.com/webjars/bootstrap) from 4.6.2 to 5.3.0. - [Commits](https://github.com/webjars/bootstrap/compare/bootstrap-4.6.2...bootstrap-5.3.0) --- updated-dependencies: - dependency-name: org.webjars:bootstrap dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4b915d3..85401eec 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ org.webjars bootstrap - 4.6.2 + 5.3.0 org.webjars From 61f65c2669df0f78732acfae56711d7ff39b4312 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:08:21 +0000 Subject: [PATCH 13/40] chore(deps): bump spring.boot.version from 2.7.5 to 3.1.0 Bumps `spring.boot.version` from 2.7.5 to 3.1.0. Updates `spring-boot-dependencies` from 2.7.5 to 3.1.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.5...v3.1.0) Updates `spring-boot-maven-plugin` from 2.7.5 to 3.1.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.5...v3.1.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4b915d3..5ed2f0d1 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 8.2.2 1.2.1 - 2.7.5 + 3.1.0 5.3.0 From 56da7ea1645d86b39b2f6b76cca93cf05533415d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 17:08:46 +0000 Subject: [PATCH 14/40] chore(deps): 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 e4b915d3..b56d3709 100644 --- a/pom.xml +++ b/pom.xml @@ -366,7 +366,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.0 From cbc6a878afe321e625ba6f51922ef24c48ed3d77 Mon Sep 17 00:00:00 2001 From: skayliu Date: Tue, 6 Jun 2023 23:31:54 +0800 Subject: [PATCH 15/40] feat: set encoding to UTF-8 --- src/main/resources/application.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index bea40f5d..ad792a16 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -35,6 +35,9 @@ server: port: 8082 servlet: context-path: / + encoding: + charset: UTF-8 + force-response: true allowedOriginsUrls: "" logging: From 7ad8d39338057035f4a3a4188b9e557d471592ea Mon Sep 17 00:00:00 2001 From: skayliu Date: Tue, 6 Jun 2023 23:38:16 +0800 Subject: [PATCH 16/40] chore(deps): bump hazelcast.exporter.version from 1.2.1 to 1.4.0 chore(deps): bump spring.boot.version from 3.1.0 to 2.7.12 revert(deps): bump hazelcast from 5.3.0 to 5.2.3 revert(deps): bump maven-gpg-plugin from 3.1.0 to 3.0.1 revert(deps): bump maven-surefire-plugin from 3.1.0 to 3.0.0 --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 80a3ca28..39ff9273 100644 --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,11 @@ 8.2.5 8.2.2 - 1.2.1 + 1.4.0 - 3.1.0 + 2.7.12 - 5.3.0 + 5.2.3 17 @@ -82,8 +82,8 @@ - io.camunda - spring-zeebe-starter + io.camunda.spring + spring-boot-starter-camunda ${version.zeebe.spring} @@ -155,8 +155,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j @@ -366,7 +366,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.0.0 @@ -405,7 +405,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.0.1 sign-artifacts From dcc01f41bcef102d4e5ffa92baa38ada11d6b858 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 17:06:39 +0000 Subject: [PATCH 17/40] chore(deps): bump hazelcast from 5.2.3 to 5.3.0 Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.2.3 to 5.3.0. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](https://github.com/hazelcast/hazelcast/compare/v5.2.3...v5.3.0) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast 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 39ff9273..34a54ed3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 2.7.12 - 5.2.3 + 5.3.0 17 From fcec0b621a63256e2c953e9740610d2d3cd7c436 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:06:53 +0000 Subject: [PATCH 18/40] chore(deps): bump zeebe-bom from 8.2.5 to 8.2.6 Bumps [zeebe-bom](https://github.com/camunda/zeebe) from 8.2.5 to 8.2.6. - [Release notes](https://github.com/camunda/zeebe/releases) - [Commits](https://github.com/camunda/zeebe/compare/8.2.5...8.2.6) --- updated-dependencies: - dependency-name: io.camunda:zeebe-bom 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 39ff9273..d8f8c373 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 - 8.2.5 + 8.2.6 8.2.2 1.4.0 From daf505cd0261028c1e57caa38cace3f899b6d67d Mon Sep 17 00:00:00 2001 From: skayliu Date: Thu, 8 Jun 2023 11:59:55 +0800 Subject: [PATCH 19/40] chore(deps): revert bootstrap from 5.3.0 to 4.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39ff9273..1d9b8865 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ org.webjars bootstrap - 5.3.0 + 4.6.2 org.webjars From c1b76113b81830acfbc7c9ef0c935360ac1b0bbf Mon Sep 17 00:00:00 2001 From: skayliu Date: Thu, 8 Jun 2023 12:06:37 +0800 Subject: [PATCH 20/40] chore(deps): bump popper.js from 2.9.3 to1.16.1-lts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d9b8865..de7b7e40 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.webjars popper.js - 2.9.3 + 1.16.1-lts org.webjars From 01ddeb7a9dfc51db979b58f0c01faf2bbbc922f1 Mon Sep 17 00:00:00 2001 From: skayliu Date: Thu, 8 Jun 2023 20:53:19 +0800 Subject: [PATCH 21/40] Bump spring.boot.version from 2.7.12 to 3.1.0 --- pom.xml | 24 ++++++++++++------- .../zeebe/monitor/ZeebeSimpleMonitorApp.java | 5 +--- .../monitor/entity/ElementInstanceEntity.java | 2 +- .../io/zeebe/monitor/entity/ErrorEntity.java | 2 +- .../zeebe/monitor/entity/HazelcastConfig.java | 4 ++-- .../zeebe/monitor/entity/IncidentEntity.java | 2 +- .../io/zeebe/monitor/entity/JobEntity.java | 2 +- .../zeebe/monitor/entity/MessageEntity.java | 8 +++---- .../entity/MessageSubscriptionEntity.java | 2 +- .../zeebe/monitor/entity/ProcessEntity.java | 8 +++---- .../monitor/entity/ProcessInstanceEntity.java | 6 ++--- .../io/zeebe/monitor/entity/TimerEntity.java | 2 +- .../zeebe/monitor/entity/VariableEntity.java | 2 +- .../monitor/repository/ErrorRepository.java | 3 ++- .../repository/IncidentRepository.java | 3 ++- .../monitor/repository/JobRepository.java | 3 ++- .../monitor/repository/MessageRepository.java | 3 ++- .../MessageSubscriptionRepository.java | 3 ++- .../repository/ProcessInstanceRepository.java | 3 ++- .../monitor/repository/ProcessRepository.java | 3 ++- .../monitor/repository/TimerRepository.java | 3 ++- .../repository/VariableRepository.java | 3 ++- .../monitor/rest/IncidentsViewController.java | 2 +- .../rest/InstancesAuditLogViewController.java | 2 +- ...ncesCalledProcessesListViewController.java | 2 +- .../InstancesErrorListViewController.java | 2 +- .../InstancesIncidentListViewController.java | 2 +- .../rest/InstancesJobListViewController.java | 2 +- ...MessageSubscriptionListViewController.java | 2 +- .../InstancesTimerListViewController.java | 2 +- .../rest/InstancesVariableListController.java | 2 +- .../monitor/rest/ProcessesViewController.java | 2 +- .../monitor/zeebe/ZeebeHazelcastService.java | 4 ++-- .../rest/AbstractViewOrResourceTest.java | 5 ++-- .../rest/CorsSettingsControllerTest.java | 2 +- 35 files changed, 71 insertions(+), 56 deletions(-) diff --git a/pom.xml b/pom.xml index 39ff9273..828789ca 100644 --- a/pom.xml +++ b/pom.xml @@ -22,13 +22,17 @@ 8.2.2 1.4.0 - 2.7.12 + 5.0.0 + + 3.1.0 5.2.3 17 ${version.java} + + eclipse-temurin:17-jre-forcal ${java.version} ${java.version} @@ -125,15 +129,16 @@ com.querydsl querydsl-apt - 5.0.0 - jpa + jakarta + ${querydsl.version} provided com.querydsl querydsl-jpa - 5.0.0 + ${querydsl.version} + jakarta @@ -169,12 +174,12 @@ org.webjars bootstrap - 5.3.0 + 4.6.2 org.webjars popper.js - 2.9.3 + 1.16.1-lts org.webjars @@ -319,6 +324,9 @@ + + ${jib-maven-plugin.image} + ghcr.io/camunda-community-hub/zeebe-simple-monitor ${project.version} @@ -366,7 +374,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.0 @@ -405,7 +413,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts diff --git a/src/main/java/io/zeebe/monitor/ZeebeSimpleMonitorApp.java b/src/main/java/io/zeebe/monitor/ZeebeSimpleMonitorApp.java index 17ac90d9..fd71d780 100644 --- a/src/main/java/io/zeebe/monitor/ZeebeSimpleMonitorApp.java +++ b/src/main/java/io/zeebe/monitor/ZeebeSimpleMonitorApp.java @@ -16,7 +16,6 @@ package io.zeebe.monitor; import com.samskivert.mustache.Mustache; -import io.camunda.zeebe.spring.client.EnableZeebeClient; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -39,10 +38,8 @@ import org.springframework.util.StringUtils; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @SpringBootApplication -@EnableZeebeClient @EnableScheduling @EnableAsync @EnableSpringDataWebSupport @@ -105,7 +102,7 @@ public Attributes loadAttributesFromManifest() { @Bean public WebMvcConfigurer corsConfigurer() { final String urls = this.allowedOriginsUrls; - return new WebMvcConfigurerAdapter() { + return new WebMvcConfigurer() { @Override public void addCorsMappings(CorsRegistry registry) { if (StringUtils.hasText(urls)) { diff --git a/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java b/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java index 49f5279f..90eeae15 100644 --- a/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ElementInstanceEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "ELEMENT_INSTANCE") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java index f20bd9dc..4f9cac01 100644 --- a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "ERROR") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/entity/HazelcastConfig.java b/src/main/java/io/zeebe/monitor/entity/HazelcastConfig.java index ed82700c..33486697 100644 --- a/src/main/java/io/zeebe/monitor/entity/HazelcastConfig.java +++ b/src/main/java/io/zeebe/monitor/entity/HazelcastConfig.java @@ -1,7 +1,7 @@ package io.zeebe.monitor.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public final class HazelcastConfig { diff --git a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java index 07b55577..d3dfc814 100644 --- a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "INCIDENT") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/entity/JobEntity.java b/src/main/java/io/zeebe/monitor/entity/JobEntity.java index 53aab25b..35cf2c36 100644 --- a/src/main/java/io/zeebe/monitor/entity/JobEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/JobEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "JOB") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/entity/MessageEntity.java b/src/main/java/io/zeebe/monitor/entity/MessageEntity.java index ccf068e4..2599292d 100644 --- a/src/main/java/io/zeebe/monitor/entity/MessageEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/MessageEntity.java @@ -15,10 +15,10 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; @Entity(name = "MESSAGE") public class MessageEntity { diff --git a/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java b/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java index 0229ae87..36b15ef0 100644 --- a/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/MessageSubscriptionEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "MESSAGE_SUBSCRIPTION") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java b/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java index 5fe0673e..5f88ec0a 100644 --- a/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java @@ -15,10 +15,10 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; @Entity(name = "PROCESS") public class ProcessEntity { diff --git a/src/main/java/io/zeebe/monitor/entity/ProcessInstanceEntity.java b/src/main/java/io/zeebe/monitor/entity/ProcessInstanceEntity.java index 68078a00..e38bd458 100644 --- a/src/main/java/io/zeebe/monitor/entity/ProcessInstanceEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ProcessInstanceEntity.java @@ -15,9 +15,9 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity(name = "PROCESS_INSTANCE") public class ProcessInstanceEntity { diff --git a/src/main/java/io/zeebe/monitor/entity/TimerEntity.java b/src/main/java/io/zeebe/monitor/entity/TimerEntity.java index db4a34a9..ce707dbc 100644 --- a/src/main/java/io/zeebe/monitor/entity/TimerEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/TimerEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "TIMER") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/entity/VariableEntity.java b/src/main/java/io/zeebe/monitor/entity/VariableEntity.java index 5f80822c..fd5a8561 100644 --- a/src/main/java/io/zeebe/monitor/entity/VariableEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/VariableEntity.java @@ -15,7 +15,7 @@ */ package io.zeebe.monitor.entity; -import javax.persistence.*; +import jakarta.persistence.*; @Entity(name = "VARIABLE") @Table(indexes = { diff --git a/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java b/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java index 466482a1..ed6acf6a 100644 --- a/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/ErrorRepository.java @@ -18,9 +18,10 @@ import io.zeebe.monitor.entity.ErrorEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface ErrorRepository extends PagingAndSortingRepository { +public interface ErrorRepository extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java b/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java index 3d003b6a..09284f38 100644 --- a/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/IncidentRepository.java @@ -17,9 +17,10 @@ import io.zeebe.monitor.entity.IncidentEntity; import org.springframework.data.querydsl.QuerydslPredicateExecutor; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface IncidentRepository extends PagingAndSortingRepository, QuerydslPredicateExecutor { +public interface IncidentRepository extends PagingAndSortingRepository, QuerydslPredicateExecutor, CrudRepository { Iterable findByProcessInstanceKey(long processInstanceKey); diff --git a/src/main/java/io/zeebe/monitor/repository/JobRepository.java b/src/main/java/io/zeebe/monitor/repository/JobRepository.java index c3da8756..6956ff16 100644 --- a/src/main/java/io/zeebe/monitor/repository/JobRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/JobRepository.java @@ -20,9 +20,10 @@ import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface JobRepository extends PagingAndSortingRepository { +public interface JobRepository extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/MessageRepository.java b/src/main/java/io/zeebe/monitor/repository/MessageRepository.java index ea4a02be..fd028d10 100644 --- a/src/main/java/io/zeebe/monitor/repository/MessageRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/MessageRepository.java @@ -16,6 +16,7 @@ package io.zeebe.monitor.repository; import io.zeebe.monitor.entity.MessageEntity; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface MessageRepository extends PagingAndSortingRepository {} +public interface MessageRepository extends PagingAndSortingRepository, CrudRepository {} diff --git a/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java b/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java index b4faf8a6..78c71a03 100644 --- a/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/MessageSubscriptionRepository.java @@ -20,10 +20,11 @@ import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; public interface MessageSubscriptionRepository - extends PagingAndSortingRepository { + extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey( long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java b/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java index 2f8ce05e..9688f7ac 100644 --- a/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/ProcessInstanceRepository.java @@ -19,10 +19,11 @@ import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; public interface ProcessInstanceRepository - extends PagingAndSortingRepository { + extends PagingAndSortingRepository, CrudRepository { Page findByProcessDefinitionKey( long processDefinitionKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java b/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java index 4453db87..d4844831 100644 --- a/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/ProcessRepository.java @@ -21,10 +21,11 @@ import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -public interface ProcessRepository extends PagingAndSortingRepository { +public interface ProcessRepository extends PagingAndSortingRepository, CrudRepository { Optional findByKey(long key); diff --git a/src/main/java/io/zeebe/monitor/repository/TimerRepository.java b/src/main/java/io/zeebe/monitor/repository/TimerRepository.java index 8afd81fb..28d78f3b 100644 --- a/src/main/java/io/zeebe/monitor/repository/TimerRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/TimerRepository.java @@ -19,9 +19,10 @@ import java.util.List; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface TimerRepository extends PagingAndSortingRepository { +public interface TimerRepository extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(Long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/repository/VariableRepository.java b/src/main/java/io/zeebe/monitor/repository/VariableRepository.java index 7f149fe0..f13c9478 100644 --- a/src/main/java/io/zeebe/monitor/repository/VariableRepository.java +++ b/src/main/java/io/zeebe/monitor/repository/VariableRepository.java @@ -18,9 +18,10 @@ import io.zeebe.monitor.entity.VariableEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; -public interface VariableRepository extends PagingAndSortingRepository { +public interface VariableRepository extends PagingAndSortingRepository, CrudRepository { Page findByProcessInstanceKey(long processInstanceKey, Pageable pageable); diff --git a/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java b/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java index f93eb13f..66bf9f27 100644 --- a/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/IncidentsViewController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.time.Instant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesAuditLogViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesAuditLogViewController.java index 90c94e53..744f1323 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesAuditLogViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesAuditLogViewController.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java index d9c914ac..28d7ac74 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesCalledProcessesListViewController.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java index c7949e8e..0affd98b 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesErrorListViewController.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java index 07d08ba1..4e480dcc 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesIncidentListViewController.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java index 537a5be4..cd36ef7c 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesJobListViewController.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java index 1eebbb0d..45179835 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesMessageSubscriptionListViewController.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java b/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java index 5613cead..2f946d3f 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesTimerListViewController.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java b/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java index 74b2dc92..08098549 100644 --- a/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java +++ b/src/main/java/io/zeebe/monitor/rest/InstancesVariableListController.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; diff --git a/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java b/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java index fa53932a..cfe6717c 100644 --- a/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java +++ b/src/main/java/io/zeebe/monitor/rest/ProcessesViewController.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.camunda.bpm.model.xml.instance.ModelElementInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java b/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java index 6e173bc7..7aadc5d6 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java @@ -9,8 +9,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.time.Duration; @Component diff --git a/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java b/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java index 07abb556..e887fb1b 100644 --- a/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java +++ b/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java @@ -18,7 +18,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; @@ -35,7 +35,8 @@ @ActiveProfiles("junittest") public abstract class AbstractViewOrResourceTest { - @LocalServerPort protected int port; + @LocalServerPort + protected int port; @Autowired protected MockMvc mockMvc; @Autowired protected TestRestTemplate restTemplate; @Autowired protected InstancesViewController instancesViewController; diff --git a/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java b/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java index 71210fdc..d54907d9 100644 --- a/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/CorsSettingsControllerTest.java @@ -11,7 +11,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; From 5eb6a649e2c21e17129821b0f3e904bd154f2120 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 13:08:26 +0000 Subject: [PATCH 22/40] chore(deps): bump maven-surefire-plugin from 3.0.0 to 3.1.2 Bumps [maven-surefire-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-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 828789ca..73600e19 100644 --- a/pom.xml +++ b/pom.xml @@ -374,7 +374,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.1.2 From dc110f0ccb51b944e0dfe22bf3c6d9a80e109ea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 13:09:18 +0000 Subject: [PATCH 23/40] chore(deps): bump maven-project-info-reports-plugin from 3.4.4 to 3.4.5 Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.4.4 to 3.4.5. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.4.4...maven-project-info-reports-plugin-3.4.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-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 828789ca..a52070cb 100644 --- a/pom.xml +++ b/pom.xml @@ -255,7 +255,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.4 + 3.4.5 org.sonatype.plugins From 3dfa0bd3a8b96f0055e818eca35de1f25fb28af5 Mon Sep 17 00:00:00 2001 From: skayliu Date: Fri, 9 Jun 2023 22:55:19 +0800 Subject: [PATCH 24/40] fix(test): Bpmn.readModelFromStream method to avoid test failed on Windows 10 --- .../rest/InstancesTimerListViewControllerTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java b/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java index 27a2db8f..bc0f5055 100644 --- a/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/InstancesTimerListViewControllerTest.java @@ -9,10 +9,10 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import io.camunda.zeebe.model.bpmn.Bpmn; +import io.camunda.zeebe.model.bpmn.BpmnModelInstance; import io.zeebe.monitor.entity.ProcessEntity; import io.zeebe.monitor.entity.ProcessInstanceEntity; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,13 +35,10 @@ public void setUp() { @Test void timers_list_view_contains_pagination_elements() throws Exception { // GIVEN - String bpmn = - Files.readString( - Paths.get(this.getClass().getClassLoader().getResource("orderProcess.bpmn").getPath())); - + BpmnModelInstance modelInstance = Bpmn.readModelFromStream(this.getClass().getClassLoader().getResourceAsStream("orderProcess.bpmn")); ProcessInstanceEntity processInstanceEntity = mock(ProcessInstanceEntity.class, RETURNS_MOCKS); ProcessEntity processEntity = mock(ProcessEntity.class, RETURNS_MOCKS); - when(processEntity.getResource()).thenReturn(bpmn); + when(processEntity.getResource()).thenReturn(modelInstance.toString()); when(processInstanceRepository.findByKey(anyLong())) .thenReturn(Optional.of(processInstanceEntity)); From 403c6524d5ff511ab9a797af129149c24b9187b9 Mon Sep 17 00:00:00 2001 From: skayliu Date: Fri, 9 Jun 2023 22:56:13 +0800 Subject: [PATCH 25/40] fix(test): disable test status_page_all_DTO_fields_in_template_can_be_resolved --- .../java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java b/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java index a5596215..b5311ad2 100644 --- a/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java @@ -10,6 +10,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -58,6 +59,7 @@ public void index_page_contains_whitelabeling_css() throws Exception { ""))); } + @Disabled @Test public void status_page_all_DTO_fields_in_template_can_be_resolved() throws Exception { mockMvc From 17da5a70b97521923c2d0c09533274e3b0a0e808 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:05:47 +0000 Subject: [PATCH 26/40] chore(deps): bump hazelcast from 5.3.0 to 5.3.1 Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](https://github.com/hazelcast/hazelcast/compare/v5.3.0...v5.3.1) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast 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 2eb96a71..104e42f8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.1.0 - 5.3.0 + 5.3.1 17 From 81bf809d4fdf60105f728ebe1760e7b28be6f4d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 17:04:12 +0000 Subject: [PATCH 27/40] chore(deps): bump zeebe-bom from 8.2.6 to 8.2.7 Bumps [zeebe-bom](https://github.com/camunda/zeebe) from 8.2.6 to 8.2.7. - [Release notes](https://github.com/camunda/zeebe/releases) - [Commits](https://github.com/camunda/zeebe/compare/8.2.6...8.2.7) --- updated-dependencies: - dependency-name: io.camunda:zeebe-bom 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 2eb96a71..390fa7db 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 - 8.2.6 + 8.2.7 8.2.2 1.4.0 From e1a703587b433eefbc72d331fa21608bd794208c Mon Sep 17 00:00:00 2001 From: skayliu Date: Thu, 15 Jun 2023 10:50:33 +0800 Subject: [PATCH 28/40] fix: add length setting for lob annotation column After update to Hibernate 6 the lob annotation for DDL has changed, early version the default type for mysql is longtext, now it's tinytext. https://docs.jboss.org/hibernate/orm/6.2/userguide/html_single/Hibernate_User_Guide.html#basic-lob --- src/main/java/io/zeebe/monitor/entity/ErrorEntity.java | 5 +++-- src/main/java/io/zeebe/monitor/entity/IncidentEntity.java | 3 ++- src/main/java/io/zeebe/monitor/entity/MessageEntity.java | 3 ++- src/main/java/io/zeebe/monitor/entity/ProcessEntity.java | 8 +++----- src/main/java/io/zeebe/monitor/entity/VariableEntity.java | 3 ++- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java index 4f9cac01..b98852bf 100644 --- a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java @@ -16,6 +16,7 @@ package io.zeebe.monitor.entity; import jakarta.persistence.*; +import org.hibernate.Length; @Entity(name = "ERROR") @Table(indexes = { @@ -35,11 +36,11 @@ public class ErrorEntity { @Column(name = "PROCESS_INSTANCE_KEY_") private long processInstanceKey; - @Column(name = "EXCEPTION_MESSAGE_") + @Column(name = "EXCEPTION_MESSAGE_",length= Length.LONG32) @Lob private String exceptionMessage; - @Column(name = "STACKTRACE_") + @Column(name = "STACKTRACE_",length= Length.LONG32) @Lob private String stacktrace; diff --git a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java index d3dfc814..8c3faec7 100644 --- a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java @@ -16,6 +16,7 @@ package io.zeebe.monitor.entity; import jakarta.persistence.*; +import org.hibernate.Length; @Entity(name = "INCIDENT") @Table(indexes = { @@ -47,7 +48,7 @@ public class IncidentEntity { @Column(name = "ERROR_TYPE_") private String errorType; - @Column(name = "ERROR_MSG_") + @Column(name = "ERROR_MSG_",length= Length.LONG32) @Lob private String errorMessage; diff --git a/src/main/java/io/zeebe/monitor/entity/MessageEntity.java b/src/main/java/io/zeebe/monitor/entity/MessageEntity.java index 2599292d..28d3d852 100644 --- a/src/main/java/io/zeebe/monitor/entity/MessageEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/MessageEntity.java @@ -19,6 +19,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Lob; +import org.hibernate.Length; @Entity(name = "MESSAGE") public class MessageEntity { @@ -36,7 +37,7 @@ public class MessageEntity { @Column(name = "MESSAGE_ID_") private String messageId; - @Column(name = "PAYLOAD_") + @Column(name = "PAYLOAD_",length= Length.LONG32) @Lob private String payload; diff --git a/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java b/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java index 5f88ec0a..a23fb8bd 100644 --- a/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ProcessEntity.java @@ -15,10 +15,8 @@ */ package io.zeebe.monitor.entity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Lob; +import jakarta.persistence.*; +import org.hibernate.Length; @Entity(name = "PROCESS") public class ProcessEntity { @@ -33,7 +31,7 @@ public class ProcessEntity { private int version; @Lob - @Column(name = "RESOURCE_") + @Column(name = "RESOURCE_",length= Length.LONG32) private String resource; @Column(name = "TIMESTAMP_") diff --git a/src/main/java/io/zeebe/monitor/entity/VariableEntity.java b/src/main/java/io/zeebe/monitor/entity/VariableEntity.java index fd5a8561..59453406 100644 --- a/src/main/java/io/zeebe/monitor/entity/VariableEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/VariableEntity.java @@ -16,6 +16,7 @@ package io.zeebe.monitor.entity; import jakarta.persistence.*; +import org.hibernate.Length; @Entity(name = "VARIABLE") @Table(indexes = { @@ -37,7 +38,7 @@ public class VariableEntity { @Column(name = "NAME_") private String name; - @Column(name = "VALUE_") + @Column(name = "VALUE_",length= Length.LONG32) @Lob private String value; From afe60558f97eb9604ed8eea37c2fd7522fa6c0ba Mon Sep 17 00:00:00 2001 From: skayliu Date: Thu, 15 Jun 2023 10:54:31 +0800 Subject: [PATCH 29/40] fix: change deprecated MySQL8Dialect to MySQLDialect After update to Hibernate 6 the MySQL8Dialect is deprecated, change it to MySQLDialect. --- README.md | 2 +- docker/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa39905b..adf2283b 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ The configuration for using MySql is similar but with an additional setting for - spring.datasource.username=root - spring.datasource.password=zeebe - spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -- spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect +- spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect - spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl ``` diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 56411446..5064eecc 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -75,7 +75,7 @@ services: - spring.datasource.username=root - spring.datasource.password=zeebe - spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver - - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect + - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect - spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl ports: - "8082:8082" From 10fafcf07ad27449fefbda977ac4a107c533defc Mon Sep 17 00:00:00 2001 From: skayliu Date: Thu, 15 Jun 2023 11:06:51 +0800 Subject: [PATCH 30/40] feat: allow set the hazelcast clusterName if more than two Zeebe with hazelcast exporter is deployed in the same subnet, the hazelcast clusterName is default dev, even we config the hazelcast clusterName in Zeebe, but we can't set the hazelcast clusterName in zeebe simple monitor,so add this config args. --- README.md | 5 ++++- docker/docker-compose.yml | 4 ++++ .../java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java | 6 ++++++ src/main/resources/application.yaml | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index adf2283b..509b87f5 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,10 @@ docker pull ghcr.io/camunda-community-hub/zeebe-simple-monitor:2.4.1 * ensure that a Zeebe broker is running with a [Hazelcast exporter](https://github.com/camunda-community-hub/zeebe-hazelcast-exporter#install) (>= `1.0.0`) * forward the Hazelcast port to the docker container (default: `5701`) +* if you want set the Hazelcast clusterName then config the environment of zeebe broker by setting `- ZEEBE_HAZELCAST_CLUSTER_NAME=dev` (default: `dev`) * configure the connection to the Zeebe broker by setting `zeebe.client.broker.gateway-address` (default: `localhost:26500`) -* configure the connection to Hazelcast by setting `zeebe.client.worker.hazelcast.connection` (default: `localhost:5701`) +* configure the connection to Hazelcast by setting `zeebe.client.worker.hazelcast.connection` (default: `localhost:5701`) +* configure the clusterName to Hazelcast by setting `zeebe.client.worker.hazelcast.clusterName` (default: `dev`) If the Zeebe broker runs on your local machine with the default configs then start the container with the following command: @@ -87,6 +89,7 @@ zeebe: worker: hazelcast: connection: localhost:5701 + clusterName: dev connectionTimeout: PT30S spring: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5064eecc..92374d4a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,6 +10,7 @@ services: image: ghcr.io/camunda-community-hub/zeebe-with-hazelcast-exporter:8.0.5 environment: - ZEEBE_LOG_LEVEL=debug + - ZEEBE_HAZELCAST_CLUSTER_NAME=dev ports: - "26500:26500" - "9600:9600" @@ -23,6 +24,7 @@ services: environment: - zeebe.client.broker.gateway-address=zeebe:26500 - zeebe.client.worker.hazelcast.connection=zeebe:5701 + - zeebe.client.worker.hazelcast.clusterName=dev ports: - "8082:8082" depends_on: @@ -38,6 +40,7 @@ services: environment: - zeebe.client.broker.gateway-address=zeebe:26500 - zeebe.client.worker.hazelcast.connection=zeebe:5701 + - zeebe.client.worker.hazelcast.clusterName=dev - spring.datasource.url=jdbc:postgresql://postgres-zeebe-simple-monitor:5432/postgres - spring.datasource.username=postgres - spring.datasource.password=zeebe @@ -71,6 +74,7 @@ services: environment: - zeebe.client.broker.gateway-address=zeebe:26500 - zeebe.client.worker.hazelcast.connection=zeebe:5701 + - zeebe.client.worker.hazelcast.clusterName=dev - spring.datasource.url=jdbc:mysql://mysql-zeebe-simple-monitor:3306/simple_monitor?createDatabaseIfNotExist=true - spring.datasource.username=root - spring.datasource.password=zeebe diff --git a/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java b/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java index 7aadc5d6..307678aa 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java @@ -24,6 +24,8 @@ public class ZeebeHazelcastService { @Value("${zeebe.client.worker.hazelcast.connectionTimeout}") private String hazelcastConnectionTimeout; + @Value("${zeebe.client.worker.hazelcast.clusterName}") + private String hazelcastClusterName; @Autowired private ZeebeImportService importService; private AutoCloseable closeable; @@ -38,6 +40,10 @@ public void start() { connectionRetryConfig.setClusterConnectTimeoutMillis( Duration.parse(hazelcastConnectionTimeout).toMillis()); + if(hazelcastClusterName != null) { + clientConfig.setClusterName(hazelcastClusterName); + } + LOG.info("Connecting to Hazelcast '{}'", hazelcastConnection); final HazelcastInstance hazelcast = HazelcastClient.newHazelcastClient(clientConfig); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index ad792a16..3ee8170a 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -6,6 +6,7 @@ zeebe: worker: hazelcast: connection: localhost:5701 + clusterName: dev connectionTimeout: PT30S spring: From 4d7d78721a425e2ae1e535e1c5b41d9709df64e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:16:43 +0000 Subject: [PATCH 31/40] chore(deps): bump webjars-locator from 0.46 to 0.47 Bumps [webjars-locator](https://github.com/webjars/webjars-locator) from 0.46 to 0.47. - [Commits](https://github.com/webjars/webjars-locator/compare/webjars-locator-0.46...webjars-locator-0.47) --- updated-dependencies: - dependency-name: org.webjars:webjars-locator 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 7210a749..3d66799d 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ org.webjars webjars-locator - 0.46 + 0.47 org.webjars From f58837bdcc3456041b46ae0d866c8e3af5eebede Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 17:08:33 +0000 Subject: [PATCH 32/40] chore(deps): bump spring.boot.version from 3.1.0 to 3.1.1 Bumps `spring.boot.version` from 3.1.0 to 3.1.1. Updates `spring-boot-dependencies` from 3.1.0 to 3.1.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.0...v3.1.1) Updates `spring-boot-maven-plugin` from 3.1.0 to 3.1.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-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 7210a749..38494a98 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 5.0.0 - 3.1.0 + 3.1.1 5.3.1 From 6b6aebff94f078f24b3156bbfd58f556bdedb31c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 16:09:33 +0000 Subject: [PATCH 33/40] chore(deps): bump zeebe-bom from 8.2.7 to 8.2.8 Bumps [zeebe-bom](https://github.com/camunda/zeebe) from 8.2.7 to 8.2.8. - [Release notes](https://github.com/camunda/zeebe/releases) - [Commits](https://github.com/camunda/zeebe/compare/8.2.7...8.2.8) --- updated-dependencies: - dependency-name: io.camunda:zeebe-bom 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 d39700d1..749b2d00 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 - 8.2.7 + 8.2.8 8.2.2 1.4.0 From fe278bd9686fb8580212bba6394908ce13c19e49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:09:17 +0000 Subject: [PATCH 34/40] chore(deps): bump h2 from 2.1.214 to 2.2.220 Bumps [h2](https://github.com/h2database/h2database) from 2.1.214 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.1.214...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 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 d39700d1..b13c3a61 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.h2database h2 - 2.1.214 + 2.2.220 From 7fdfa6308170ffd09e16c4a993301531846aafb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 09:02:56 +0000 Subject: [PATCH 35/40] chore(deps): bump spring-boot-starter-camunda from 8.2.2 to 8.2.3 Bumps [spring-boot-starter-camunda](https://github.com/camunda-community-hub/spring-zeebe) from 8.2.2 to 8.2.3. - [Release notes](https://github.com/camunda-community-hub/spring-zeebe/releases) - [Commits](https://github.com/camunda-community-hub/spring-zeebe/compare/8.2.2...8.2.3) --- updated-dependencies: - dependency-name: io.camunda.spring:spring-boot-starter-camunda 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 2384a705..6e3b24c7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ UTF-8 8.2.8 - 8.2.2 + 8.2.3 1.4.0 5.0.0 From d8e66917853f3e678097a824a15c5e321e22de9f Mon Sep 17 00:00:00 2001 From: nitram509 Date: Sat, 18 Nov 2023 11:31:10 +0100 Subject: [PATCH 36/40] just use 32k as length limit, should be more than enough --- src/main/java/io/zeebe/monitor/entity/ErrorEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java index b98852bf..7490749d 100644 --- a/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/ErrorEntity.java @@ -36,11 +36,11 @@ public class ErrorEntity { @Column(name = "PROCESS_INSTANCE_KEY_") private long processInstanceKey; - @Column(name = "EXCEPTION_MESSAGE_",length= Length.LONG32) + @Column(name = "EXCEPTION_MESSAGE_",length= Length.LONG16) @Lob private String exceptionMessage; - @Column(name = "STACKTRACE_",length= Length.LONG32) + @Column(name = "STACKTRACE_",length= Length.LONG16) @Lob private String stacktrace; From 8718b742efe88164edf80dbbe2a65effe2f6761f Mon Sep 17 00:00:00 2001 From: nitram509 Date: Sat, 18 Nov 2023 11:31:28 +0100 Subject: [PATCH 37/40] re-order bullet items, improve readability --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 509b87f5..6082bb59 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,13 @@ docker pull ghcr.io/camunda-community-hub/zeebe-simple-monitor:2.4.1 ``` * ensure that a Zeebe broker is running with a [Hazelcast exporter](https://github.com/camunda-community-hub/zeebe-hazelcast-exporter#install) (>= `1.0.0`) -* forward the Hazelcast port to the docker container (default: `5701`) -* if you want set the Hazelcast clusterName then config the environment of zeebe broker by setting `- ZEEBE_HAZELCAST_CLUSTER_NAME=dev` (default: `dev`) * configure the connection to the Zeebe broker by setting `zeebe.client.broker.gateway-address` (default: `localhost:26500`) * configure the connection to Hazelcast by setting `zeebe.client.worker.hazelcast.connection` (default: `localhost:5701`) -* configure the clusterName to Hazelcast by setting `zeebe.client.worker.hazelcast.clusterName` (default: `dev`) +* forward the Hazelcast port to the docker container (default: `5701`) +* if you want to set the Hazelcast clusterName then you need to adjust the Zeebe broker and the Zeebe Simple Monitor alike + * Hint: this is useful, e.g. when you want to adjust the ringbuffer's size in the Hazelcast cluster (the name is relevant) + * a) in Zeebe broker, set the environment variable `ZEEBE_HAZELCAST_CLUSTER_NAME=dev` (default: `dev`) + * b) in Zeebe Simple Monitor, change the setting `zeebe.client.worker.hazelcast.clusterName` (default: `dev`) If the Zeebe broker runs on your local machine with the default configs then start the container with the following command: From a2fa5aea0031885ac44ca487880552d4c04ee329 Mon Sep 17 00:00:00 2001 From: nitram509 Date: Sat, 18 Nov 2023 11:32:28 +0100 Subject: [PATCH 38/40] just use 32k as length limit, should be more than enough --- src/main/java/io/zeebe/monitor/entity/IncidentEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java index 8c3faec7..cc93bf59 100644 --- a/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java +++ b/src/main/java/io/zeebe/monitor/entity/IncidentEntity.java @@ -48,7 +48,7 @@ public class IncidentEntity { @Column(name = "ERROR_TYPE_") private String errorType; - @Column(name = "ERROR_MSG_",length= Length.LONG32) + @Column(name = "ERROR_MSG_",length= Length.LONG16) @Lob private String errorMessage; From 731ff501cc4ef23ee5b933a8c80d016d06925483 Mon Sep 17 00:00:00 2001 From: nitram509 Date: Sat, 18 Nov 2023 11:46:55 +0100 Subject: [PATCH 39/40] always print cluster name for verbosity --- .../monitor/zeebe/ZeebeHazelcastService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java b/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java index 307678aa..1a093c77 100644 --- a/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java +++ b/src/main/java/io/zeebe/monitor/zeebe/ZeebeHazelcastService.java @@ -3,16 +3,15 @@ import com.hazelcast.client.HazelcastClient; import com.hazelcast.client.config.ClientConfig; import com.hazelcast.core.HazelcastInstance; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import java.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import java.time.Duration; - @Component public class ZeebeHazelcastService { @@ -26,6 +25,7 @@ public class ZeebeHazelcastService { @Value("${zeebe.client.worker.hazelcast.clusterName}") private String hazelcastClusterName; + @Autowired private ZeebeImportService importService; private AutoCloseable closeable; @@ -40,12 +40,12 @@ public void start() { connectionRetryConfig.setClusterConnectTimeoutMillis( Duration.parse(hazelcastConnectionTimeout).toMillis()); - if(hazelcastClusterName != null) { - clientConfig.setClusterName(hazelcastClusterName); - } - - LOG.info("Connecting to Hazelcast '{}'", hazelcastConnection); + clientConfig.setClusterName(hazelcastClusterName); + LOG.info( + "Connecting to Hazelcast '{}', cluster name '{}'", + hazelcastConnection, + hazelcastClusterName); final HazelcastInstance hazelcast = HazelcastClient.newHazelcastClient(clientConfig); LOG.info("Importing records from Hazelcast..."); From 8012adbd3b47486329a0c96c43fbbd7224d36567 Mon Sep 17 00:00:00 2001 From: nitram509 Date: Sat, 18 Nov 2023 12:14:27 +0100 Subject: [PATCH 40/40] mock cluster status, to enable test again (missing status bean cased replacement character to kick in) FYI @skayliu, referring to your question in #565 --- .../rest/AbstractViewOrResourceTest.java | 18 ++++++++++++++++-- .../rest/ProcessesViewControllerTest.java | 6 ++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java b/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java index e887fb1b..cf92205d 100644 --- a/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java +++ b/src/test/java/io/zeebe/monitor/rest/AbstractViewOrResourceTest.java @@ -1,5 +1,9 @@ package io.zeebe.monitor.rest; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import io.camunda.zeebe.client.api.response.Topology; import io.zeebe.monitor.repository.ElementInstanceRepository; import io.zeebe.monitor.repository.ErrorRepository; import io.zeebe.monitor.repository.HazelcastConfigRepository; @@ -12,6 +16,8 @@ import io.zeebe.monitor.repository.TimerRepository; import io.zeebe.monitor.repository.VariableRepository; import io.zeebe.monitor.zeebe.ZeebeHazelcastService; +import io.zeebe.monitor.zeebe.status.ClusterStatus; +import io.zeebe.monitor.zeebe.status.ZeebeStatusKeeper; import io.zeebe.monitor.zeebe.status.ZeebeStatusUpdateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; @@ -35,12 +41,12 @@ @ActiveProfiles("junittest") public abstract class AbstractViewOrResourceTest { - @LocalServerPort - protected int port; + @LocalServerPort protected int port; @Autowired protected MockMvc mockMvc; @Autowired protected TestRestTemplate restTemplate; @Autowired protected InstancesViewController instancesViewController; @Autowired protected InstancesVariableListController instancesVariableListController; + @Autowired protected ZeebeStatusKeeper zeebeStatusKeeper; @MockBean protected ZeebeStatusUpdateService zeebeStatusUpdateService; @MockBean protected HazelcastConfigRepository hazelcastConfigRepository; @@ -55,4 +61,12 @@ public abstract class AbstractViewOrResourceTest { @MockBean protected TimerRepository timerRepository; @MockBean protected VariableRepository variableRepository; @MockBean protected ErrorRepository errorRepository; + + protected void mockCLusterStatusForViews() { + final Topology topologyMock = mock(Topology.class); + ClusterStatus clusterStatus = new ClusterStatus(); + when(topologyMock.getGatewayVersion()).thenReturn("v9.9.9"); + clusterStatus.setTopology(topologyMock); + zeebeStatusKeeper.setStatus(clusterStatus); + } } diff --git a/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java b/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java index b5311ad2..6205ac16 100644 --- a/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java +++ b/src/test/java/io/zeebe/monitor/rest/ProcessesViewControllerTest.java @@ -10,7 +10,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -18,8 +17,9 @@ public class ProcessesViewControllerTest extends AbstractViewOrResourceTest { @BeforeEach - public void setUp() throws Exception { + public void setUp() { when(processRepository.findAll(any(Pageable.class))).thenReturn(Page.empty()); + mockCLusterStatusForViews(); } @Test @@ -59,12 +59,10 @@ public void index_page_contains_whitelabeling_css() throws Exception { ""))); } - @Disabled @Test public void status_page_all_DTO_fields_in_template_can_be_resolved() throws Exception { mockMvc .perform(get("/views/processes")) .andExpect(content().string(not(containsString(REPLACEMENT_CHARACTER_QUESTIONMARK)))); } - }