From b494f5ac8026be29f5e06b5ba59bd9e42961e7c0 Mon Sep 17 00:00:00 2001
From: Mathias Vandaele <mathias.vandaele@camunda.com>
Date: Mon, 6 Jan 2025 16:44:04 +0100
Subject: [PATCH] refactor(camunda-client) bring a single camunda version

---
 connector-runtime/connector-runtime-core/pom.xml    |  1 +
 .../spring-boot-starter-camunda-connectors/pom.xml  |  4 ++--
 ...untimeStartupWithConnectorsFromEnvVarsTests.java | 10 +++++-----
 connector-sdk/document/pom.xml                      |  1 +
 .../connectors-e2e-test-automation-anywhere/pom.xml |  2 +-
 connectors-e2e-test/connectors-e2e-test-aws/pom.xml |  2 +-
 .../connectors-e2e-test-easy-post/pom.xml           |  2 +-
 .../connectors-e2e-test-http/pom.xml                |  2 +-
 .../connectors-e2e-test-kafka/pom.xml               |  2 +-
 .../connectors-e2e-test-rabbitmq/pom.xml            |  2 +-
 .../connectors-e2e-test-soap/pom.xml                |  2 +-
 parent/pom.xml                                      | 13 ++++++-------
 12 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/connector-runtime/connector-runtime-core/pom.xml b/connector-runtime/connector-runtime-core/pom.xml
index d942e3e338..9c041fc374 100644
--- a/connector-runtime/connector-runtime-core/pom.xml
+++ b/connector-runtime/connector-runtime-core/pom.xml
@@ -51,6 +51,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-client-java</artifactId>
+      <version>${version.camunda}</version>
     </dependency>
 
     <dependency>
diff --git a/connector-runtime/spring-boot-starter-camunda-connectors/pom.xml b/connector-runtime/spring-boot-starter-camunda-connectors/pom.xml
index 4b5ef320e7..a39aa9bf75 100644
--- a/connector-runtime/spring-boot-starter-camunda-connectors/pom.xml
+++ b/connector-runtime/spring-boot-starter-camunda-connectors/pom.xml
@@ -28,12 +28,12 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>spring-boot-starter-camunda-sdk</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-client-java</artifactId>
-      <version>${version.camunda-client}</version>
+      <version>${version.camunda}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/connector-runtime/spring-boot-starter-camunda-connectors/src/test/java/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java b/connector-runtime/spring-boot-starter-camunda-connectors/src/test/java/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java
index beb6437c6b..73217c46e8 100644
--- a/connector-runtime/spring-boot-starter-camunda-connectors/src/test/java/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java
+++ b/connector-runtime/spring-boot-starter-camunda-connectors/src/test/java/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java
@@ -49,6 +49,11 @@ class RuntimeStartupWithConnectorsFromEnvVarsTests {
 
   @Autowired private JobWorkerManager jobWorkerManager;
 
+  @AfterTestClass
+  public static void cleanup() throws Exception {
+    EnvVarsConnectorDiscovery.clearHardwiredEnvironmentVariable();
+  }
+
   @BeforeTestClass
   public void prepare() throws Exception {
     EnvVarsConnectorDiscovery.addHardwiredEnvironmentVariable(
@@ -57,11 +62,6 @@ public void prepare() throws Exception {
         "CONNECTOR_TEST2_TYPE", "non-default-TEST-task-type");
   }
 
-  @AfterTestClass
-  public static void cleanup() throws Exception {
-    EnvVarsConnectorDiscovery.clearHardwiredEnvironmentVariable();
-  }
-
   @Test
   public void httpConnectorLoadedViaEnvVar() {
     if (true) {
diff --git a/connector-sdk/document/pom.xml b/connector-sdk/document/pom.xml
index 25749d8c73..7fd3f8ae35 100644
--- a/connector-sdk/document/pom.xml
+++ b/connector-sdk/document/pom.xml
@@ -18,6 +18,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-client-java</artifactId>
+      <version>${version.camunda}</version>
     </dependency>
   </dependencies>
 
diff --git a/connectors-e2e-test/connectors-e2e-test-automation-anywhere/pom.xml b/connectors-e2e-test/connectors-e2e-test-automation-anywhere/pom.xml
index 89314f0116..e754d5f6f8 100644
--- a/connectors-e2e-test/connectors-e2e-test-automation-anywhere/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-automation-anywhere/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
     <!-- Test -->
diff --git a/connectors-e2e-test/connectors-e2e-test-aws/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/pom.xml
index 88b4513263..5db045d5db 100644
--- a/connectors-e2e-test/connectors-e2e-test-aws/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-aws/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
 </dependencies>
diff --git a/connectors-e2e-test/connectors-e2e-test-easy-post/pom.xml b/connectors-e2e-test/connectors-e2e-test-easy-post/pom.xml
index d3efe1869d..de5e837e25 100644
--- a/connectors-e2e-test/connectors-e2e-test-easy-post/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-easy-post/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
     <!-- Test -->
diff --git a/connectors-e2e-test/connectors-e2e-test-http/pom.xml b/connectors-e2e-test/connectors-e2e-test-http/pom.xml
index ca3b3be657..36f8c054fb 100644
--- a/connectors-e2e-test/connectors-e2e-test-http/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-http/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
     <!-- Test -->
diff --git a/connectors-e2e-test/connectors-e2e-test-kafka/pom.xml b/connectors-e2e-test/connectors-e2e-test-kafka/pom.xml
index ca4556fe7a..f642300e95 100644
--- a/connectors-e2e-test/connectors-e2e-test-kafka/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-kafka/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
     <dependency>
diff --git a/connectors-e2e-test/connectors-e2e-test-rabbitmq/pom.xml b/connectors-e2e-test/connectors-e2e-test-rabbitmq/pom.xml
index deb5979a7e..2c7ab8cf97 100644
--- a/connectors-e2e-test/connectors-e2e-test-rabbitmq/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-rabbitmq/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
     <!-- Test -->
diff --git a/connectors-e2e-test/connectors-e2e-test-soap/pom.xml b/connectors-e2e-test/connectors-e2e-test-soap/pom.xml
index 9199934c9d..38dc2f8af2 100644
--- a/connectors-e2e-test/connectors-e2e-test-soap/pom.xml
+++ b/connectors-e2e-test/connectors-e2e-test-soap/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-process-test-spring</artifactId>
-      <version>${version.zeebe}</version>
+      <version>${version.camunda}</version>
     </dependency>
 
     <!-- Test -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 6508c83014..3b60c3213b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -71,8 +71,7 @@ limitations under the License.</license.inlineheader>
     <nexus.sonatype.url>https://s01.oss.sonatype.org</nexus.sonatype.url>
 
     <!-- Camunda internal libraries -->
-    <version.zeebe>8.7.0-alpha3-rc1</version.zeebe>
-    <version.camunda-client>8.7.0-alpha3-rc1</version.camunda-client>
+    <version.camunda>8.7.0-alpha3-rc3</version.camunda>
     <version.feel-engine>1.19.0</version.feel-engine>
 
     <!-- Third party dependencies -->
@@ -284,18 +283,18 @@ limitations under the License.</license.inlineheader>
       <dependency>
         <groupId>io.camunda</groupId>
         <artifactId>spring-boot-starter-camunda-sdk</artifactId>
-        <version>${version.zeebe}</version>
+        <version>${version.camunda}</version>
       </dependency>
 
       <dependency>
         <groupId>io.camunda</groupId>
-        <artifactId>camunda-client-java</artifactId>
-        <version>${version.camunda-client}</version>
+        <artifactId>camunda-java</artifactId>
+        <version>${version.camunda}</version>
       </dependency>
       <dependency>
         <groupId>io.camunda</groupId>
         <artifactId>zeebe-bpmn-model</artifactId>
-        <version>${version.zeebe}</version>
+        <version>${version.camunda}</version>
       </dependency>
 
       <dependency>
@@ -523,7 +522,7 @@ limitations under the License.</license.inlineheader>
       <dependency>
         <groupId>io.camunda</groupId>
         <artifactId>camunda-process-test-spring</artifactId>
-        <version>${version.zeebe}</version>
+        <version>${version.camunda}</version>
         <scope>test</scope>
       </dependency>
       <dependency>