refactor(camunda-client) bring a single camunda version

camunda · Jan 9, 2025 · b494f5a · b494f5a
1 parent b0b7ec8
commit b494f5a
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 21 deletions.
diff --git 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
@@ -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/...a/io/camunda/connector/runtime/outbound/RuntimeStartupWithConnectorsFromEnvVarsTests.java b/...a/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>