Merge pull request #600 from nitram509/skayliu_pr_565_bump_spring_boot

Bump spring.boot.version from 2.7.x to 3.1.5 (#565) improved

README.md

@@ -33,9 +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`)
 * 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`)
+* 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:  
 
@@ -87,6 +91,7 @@ zeebe:
     worker:
       hazelcast:
         connection: localhost:5701
+        clusterName: dev
         connectionTimeout: PT30S
 
 spring:
@@ -170,7 +175,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
 ```
 

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,11 +74,12 @@ 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
       - 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"

pom.xml

@@ -22,14 +22,18 @@
         <version.zeebe.spring>8.3.1</version.zeebe.spring>
         <hazelcast.exporter.version>1.4.0</hazelcast.exporter.version>
 
-        <spring.boot.version>2.7.5</spring.boot.version>
+        <querydsl.version>5.0.0</querydsl.version>
+
+        <spring.boot.version>3.1.5</spring.boot.version>
         <!-- pin Hazelcast version because of spring-boot-dependencies -->
         <version.hazelcast>5.3.6</version.hazelcast>
 
         <!-- release parent settings -->
         <version.java>17</version.java>
         <java.version>${version.java}</java.version>
 
+        <jib-maven-plugin.image>eclipse-temurin:17-jre-forcal</jib-maven-plugin.image>
+
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
@@ -82,8 +86,8 @@
 
         <!-- spring deps-->
         <dependency>
-            <groupId>io.camunda</groupId>
-            <artifactId>spring-zeebe-starter</artifactId>
+            <groupId>io.camunda.spring</groupId>
+            <artifactId>spring-boot-starter-camunda</artifactId>
             <version>${version.zeebe.spring}</version>
         </dependency>
 
@@ -125,15 +129,16 @@
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
-            <version>5.0.0</version>
-            <classifier>jpa</classifier>
+            <version>${querydsl.version}</version>
+            <classifier>jakarta</classifier>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-jpa</artifactId>
-            <version>5.0.0</version>
+            <version>${querydsl.version}</version>
+            <classifier>jakarta</classifier>
         </dependency>
 
         <dependency>
@@ -155,8 +160,8 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <!-- js libs -->
@@ -319,6 +324,9 @@
                     </execution>
                 </executions>
                 <configuration>
+                   <from>
+                      <image>${jib-maven-plugin.image}</image>
+                   </from>
                     <to>
                         <image>ghcr.io/camunda-community-hub/zeebe-simple-monitor</image>
                         <tags>${project.version}</tags>

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)) {

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 = {

src/main/java/io/zeebe/monitor/entity/ErrorEntity.java

@@ -15,7 +15,8 @@
  */
 package io.zeebe.monitor.entity;
 
-import javax.persistence.*;
+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.LONG16)
   @Lob
   private String exceptionMessage;
 
-  @Column(name = "STACKTRACE_")
+  @Column(name = "STACKTRACE_",length= Length.LONG16)
   @Lob
   private String stacktrace;
 

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 {

src/main/java/io/zeebe/monitor/entity/IncidentEntity.java

@@ -15,7 +15,8 @@
  */
 package io.zeebe.monitor.entity;
 
-import javax.persistence.*;
+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.LONG16)
   @Lob
   private String errorMessage;
 

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 = {

src/main/java/io/zeebe/monitor/entity/MessageEntity.java

@@ -15,10 +15,11 @@
  */
 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;
+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;
 

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 = {

src/main/java/io/zeebe/monitor/entity/ProcessEntity.java

@@ -15,10 +15,8 @@
  */
 package io.zeebe.monitor.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.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_")

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 {

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 = {

src/main/java/io/zeebe/monitor/entity/VariableEntity.java

@@ -15,7 +15,8 @@
  */
 package io.zeebe.monitor.entity;
 
-import javax.persistence.*;
+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;
 

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<ErrorEntity, Long> {
+public interface ErrorRepository extends PagingAndSortingRepository<ErrorEntity, Long>, CrudRepository<ErrorEntity, Long> {
 
   Page<ErrorEntity> findByProcessInstanceKey(long processInstanceKey, Pageable pageable);
 

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<IncidentEntity, Long>, QuerydslPredicateExecutor<IncidentEntity> {
+public interface IncidentRepository extends PagingAndSortingRepository<IncidentEntity, Long>, QuerydslPredicateExecutor<IncidentEntity>, CrudRepository<IncidentEntity, Long> {
 
   Iterable<IncidentEntity> findByProcessInstanceKey(long processInstanceKey);
 

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<JobEntity, Long> {
+public interface JobRepository extends PagingAndSortingRepository<JobEntity, Long>, CrudRepository<JobEntity, Long> {
 
   Page<JobEntity> findByProcessInstanceKey(long processInstanceKey, Pageable pageable);
 

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<MessageEntity, Long> {}
+public interface MessageRepository extends PagingAndSortingRepository<MessageEntity, Long>, CrudRepository<MessageEntity, Long> {}

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<MessageSubscriptionEntity, Long> {
+    extends PagingAndSortingRepository<MessageSubscriptionEntity, Long>, CrudRepository<MessageSubscriptionEntity, Long> {
 
   Page<MessageSubscriptionEntity> findByProcessInstanceKey(
       long processInstanceKey, Pageable pageable);