Upgrade and cleanup pom.xml

aowss · Apr 9, 2024 · 7e840e1 · 7e840e1
1 parent ffe02e6
commit 7e840e1
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 15 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -19,11 +19,22 @@
         <module>testing</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.camunda</groupId>
+                <artifactId>zeebe-bom</artifactId>
+                <version>${camunda.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>io.camunda</groupId>
             <artifactId>zeebe-client-java</artifactId>
-            <version>${camunda.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -19,14 +19,14 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>21</java.version>
-        <maven-compiler.version>3.11.0</maven-compiler.version>
-        <maven-surefire.version>3.2.2</maven-surefire.version>
+        <maven-compiler.version>3.13.0</maven-compiler.version>
+        <maven-surefire.version>3.2.5</maven-surefire.version>
         <camunda.version>8.4.2</camunda.version>
         <sl4j.verion>2.0.9</sl4j.verion>
-        <junit.version>5.10.1</junit.version>
+        <junit.version>5.10.2</junit.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <mockito.version>5.7.0</mockito.version>
-        <wiremock-version>3.3.1</wiremock-version>
+        <mockito.version>5.11.0</mockito.version>
+        <wiremock-version>3.5.2</wiremock-version>
     </properties>
 
     <dependencies>
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-standalone</artifactId>
             <version>${wiremock-version}</version>
             <scope>test</scope>
         </dependency>
@@ -70,7 +70,10 @@
                 <version>${maven-compiler.version}</version>
                 <configuration>
                     <release>${java.version}</release>
-                    <compilerArgs>--enable-preview</compilerArgs>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/spring-boot/error-handling/src/main/resources/application-local.yaml b/spring-boot/error-handling/src/main/resources/application-local.yaml
@@ -0,0 +1,10 @@
+zeebe:
+  client:
+    broker:
+      gateway-address: localhost:26500
+    security:
+      plaintext: true
+    cloud:
+      client-id: zeebe
+      client-secret: zecret
+      auth-url: http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token
diff --git a/spring-boot/error-handling/src/main/resources/application.yaml b/spring-boot/error-handling/src/main/resources/application.yaml
@@ -5,6 +5,6 @@ zeebe:
   client:
     cloud:
       region: ont-1
-      clusterId: 4784612d-1495-4f2a-951d-049c8b985f06
-      clientId: jMNcIFp.GJ1-ZYK~Av-8zLHM7xmYCTLs
-      clientSecret: dbz--V.YX9JzRzF_44iL9DNz.h0_1S-qpPbl~2xYt6f0ua5h3CWQ2wVulQ68b-Rm
+      clusterId: 35eedd8b-35e5-4373-8a4c-f211043e42da
+      clientId: kMVnghsS4TV7lqocluB9AsLNNRSNsCr1
+      clientSecret: EIt0BqN-bEK~hVbvN8tZO4vPgmZYQ-RbQdnqRwIsyQnZ9Bp-h5XJBT9NuS8cFnu-
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
@@ -15,7 +15,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <spring-boot.version>3.1.5</spring-boot.version>
+        <spring-boot.version>3.2.4</spring-boot.version>
     </properties>
 
     <modules>
@@ -24,6 +24,18 @@
         <module>task</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>io.camunda.spring</groupId>

diff --git a/spring-boot/rest-connector/src/main/resources/application-local.yaml b/spring-boot/rest-connector/src/main/resources/application-local.yaml
@@ -0,0 +1,21 @@
+zeebe:
+  client:
+    broker:
+      gateway-address: localhost:26500
+    security:
+      plaintext: true
+    cloud:
+      client-id: zeebe
+      client-secret: zecret
+      auth-url: http://localhost:18080/auth/realms/camunda-platform/protocol/openid-connect/token
+
+# See https://github.com/camunda/connectors/tree/main/connector-runtime/spring-boot-starter-camunda-connectors
+camunda:
+  connector:
+    polling:
+      enabled: false
+    webhook:
+      enabled: false
+
+api:
+  url: http://${ENV:prod}-rates:9999/exchangeRates
diff --git a/spring-boot/rest-connector/src/main/resources/application.yaml b/spring-boot/rest-connector/src/main/resources/application.yaml
@@ -5,9 +5,9 @@ zeebe:
   client:
     cloud:
       region: ont-1
-      clusterId: 4784612d-1495-4f2a-951d-049c8b985f06
-      clientId: jMNcIFp.GJ1-ZYK~Av-8zLHM7xmYCTLs
-      clientSecret: dbz--V.YX9JzRzF_44iL9DNz.h0_1S-qpPbl~2xYt6f0ua5h3CWQ2wVulQ68b-Rm
+      clusterId: 35eedd8b-35e5-4373-8a4c-f211043e42da
+      clientId: kMVnghsS4TV7lqocluB9AsLNNRSNsCr1
+      clientSecret: EIt0BqN-bEK~hVbvN8tZO4vPgmZYQ-RbQdnqRwIsyQnZ9Bp-h5XJBT9NuS8cFnu-
 
 # See https://github.com/camunda/connectors/tree/main/connector-runtime/spring-boot-starter-camunda-connectors
 camunda: