Merge pull request #24 from camunda-community-hub/feature/update_java…

…_to_17_spring_boot_to_3 updated to spring boot 3
camunda-community-hub · Dec 12, 2023 · 99b7392 · 99b7392
2 parents dbf5464 + 57ebd0e
commit 99b7392
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 66 deletions.
diff --git a/.github/workflows/deploy-to-github-packages.yaml b/.github/workflows/deploy-to-github-packages.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           cache: 'maven'
       - name: Publish package

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Java environment
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
           cache: maven
           gpg-private-key: ${{ secrets.MAVEN_CENTRAL_GPG_SIGNING_KEY_SEC }}

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.java>11</version.java>
+    <version.java>17</version.java>
   </properties>
 
   <build>

diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <zeebe.version>8.1.13</zeebe.version>
+    <spring.zeebe.version>8.1.15</spring.zeebe.version>
   </properties>
 
   <build>
@@ -23,8 +23,8 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>11</source>
-            <target>11</target>
+            <source>17</source>
+            <target>17</target>
           </configuration>
         </plugin>
       </plugins>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>io.vanillabp</groupId>
       <artifactId>spring-boot-support</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.6</version>
     </dependency>
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>spring-zeebe-starter</artifactId>
-      <version>${zeebe.version}</version>
+      <version>${spring.zeebe.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
-      <version>2.2.3</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
         <groupId>org.junit.jupiter</groupId>

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/Camunda8AdapterConfiguration.java b/spring-boot/src/main/java/io/vanillabp/camunda8/Camunda8AdapterConfiguration.java
@@ -34,7 +34,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @AutoConfigurationPackage(basePackageClasses = Camunda8AdapterConfiguration.class)
 @AutoConfigureBefore(ZeebeClientStarterAutoConfiguration.class)

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/DeployedBpmn.java b/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/DeployedBpmn.java
@@ -1,7 +1,7 @@
 package io.vanillabp.camunda8.deployment;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 @Entity
 @DiscriminatorValue(DeployedBpmn.TYPE)

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/DeployedProcess.java b/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/DeployedProcess.java
@@ -1,8 +1,8 @@
 package io.vanillabp.camunda8.deployment;
 
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 @Entity
 @DiscriminatorValue(DeployedProcess.TYPE)

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/Deployment.java b/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/Deployment.java
@@ -2,17 +2,17 @@
 
 import java.time.OffsetDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 
 @Entity
 @Table(name = "CAMUNDA8_DEPLOYMENTS")

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/DeploymentResource.java b/spring-boot/src/main/java/io/vanillabp/camunda8/deployment/DeploymentResource.java
@@ -2,17 +2,17 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Lob;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Lob;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 
 @Entity
 @Table(name = "CAMUNDA8_RESOURCES")

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java b/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java
@@ -8,7 +8,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 import org.camunda.bpm.model.xml.instance.ModelElementInstance;
 import org.springframework.beans.factory.ObjectProvider;

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/ZeebeClientConfiguration.java b/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/ZeebeClientConfiguration.java
diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+io.vanillabp.camunda8.Camunda8AdapterConfiguration
diff --git a/spring-boot/src/test/java/io/vanillabp/camunda8/wiring/AggregateSerializationTest.java b/spring-boot/src/test/java/io/vanillabp/camunda8/wiring/AggregateSerializationTest.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.camunda.zeebe.client.api.JsonMapper;
+import io.camunda.zeebe.client.impl.ZeebeObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -22,8 +23,7 @@ public class AggregateSerializationTest {
     @BeforeEach
     public void buildJsonMapper() {
 
-        jsonMapper = new ZeebeClientConfiguration()
-                .zeebeJsonMapper(new ObjectMapper());
+        jsonMapper = new ZeebeObjectMapper(new ObjectMapper());
 
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		io.vanillabp.camunda8.Camunda8AdapterConfiguration