refactor: change java client name (#19519)

## Description    Changed java client name, created a simple pom.xml under `zeebe/client/java` to redirect old artifact into the new one ## Related issues closes #19482
camunda · Jun 20, 2024 · 9e5f5fb · 9e5f5fb
2 parents d40c49a + 3470ce3
commit 9e5f5fb
Show file tree

Hide file tree

Showing 39 changed files with 68 additions and 41 deletions.
diff --git a/.idea/scopes/apache_license_scope.xml b/.idea/scopes/apache_license_scope.xml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ run the command: `mvn clean install -Dquickly` in the root folder.
 
 > [!NOTE]
 > All Java modules in Zeebe are built and tested with JDK 21. Most modules use language level
-> 21, exceptions are: zeebe-bpmn-model, zeebe-client-java, zeebe-gateway-protocol,
+> 21, exceptions are: zeebe-bpmn-model, camunda-client-java, zeebe-gateway-protocol,
 > zeebe-gateway-protocol-impl, zeebe-protocol and zeebe-protocol-jackson which use language level 8
 >
 > The Go client and zbctl are built and tested with Go 1.22

diff --git a/bom/README.md b/bom/README.md
@@ -30,13 +30,13 @@ section of your pom.
 Once imported, you can easily add the dependencies you need to the `dependencies` section of your pom.
 
 For example, you can use it to import the
-[Zeebe Java Client](https://docs.camunda.io/docs/apis-clients/java-client/).
+[Camunda Java Client](https://docs.camunda.io/docs/apis-clients/java-client/).
 
 ```xml
 <dependencies>
   <dependency>
     <groupId>io.camunda</groupId>
-    <artifactId>zeebe-client-java</artifactId>
+    <artifactId>camunda-client-java</artifactId>
   </dependency>
 </dependencies>
 ```

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -67,7 +67,7 @@
 
       <dependency>
         <groupId>io.camunda</groupId>
-        <artifactId>zeebe-client-java</artifactId>
+        <artifactId>camunda-client-java</artifactId>
         <version>${project.version}</version>
       </dependency>
 

diff --git a/clients/java/pom.xml b/clients/java/pom.xml
@@ -10,10 +10,10 @@
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>zeebe-client-java</artifactId>
+  <artifactId>camunda-client-java</artifactId>
   <packaging>jar</packaging>
 
-  <name>Zeebe Client Java</name>
+  <name>Camunda Client Java</name>
 
   <licenses>
     <license>

diff --git a/clients/java/src/main/java/io/camunda/zeebe/client/impl/ZeebeClientImpl.java b/clients/java/src/main/java/io/camunda/zeebe/client/impl/ZeebeClientImpl.java
@@ -179,7 +179,7 @@ public static ManagedChannel buildChannel(final ZeebeClientConfiguration config)
 
     configureConnectionSecurity(config, channelBuilder);
     channelBuilder.keepAliveTime(config.getKeepAlive().toMillis(), TimeUnit.MILLISECONDS);
-    channelBuilder.userAgent("zeebe-client-java/" + VersionUtil.getVersion());
+    channelBuilder.userAgent("camunda-client-java/" + VersionUtil.getVersion());
     channelBuilder.maxInboundMessageSize(config.getMaxMessageSize());
 
     if (config.useDefaultRetryPolicy()) {

diff --git a/clients/java/src/main/java/io/camunda/zeebe/client/impl/http/HttpClientFactory.java b/clients/java/src/main/java/io/camunda/zeebe/client/impl/http/HttpClientFactory.java
@@ -134,7 +134,7 @@ private HttpAsyncClientBuilder defaultClientBuilder() {
     return HttpAsyncClients.custom()
         .setConnectionManager(connectionManager)
         .setDefaultHeaders(Collections.singletonList(acceptHeader))
-        .setUserAgent("zeebe-client-java/" + VersionUtil.getVersion())
+        .setUserAgent("camunda-client-java/" + VersionUtil.getVersion())
         .evictExpiredConnections()
         .setCharCodingConfig(CharCodingConfig.custom().setCharset(StandardCharsets.UTF_8).build())
         .evictIdleConnections(TimeValue.ofSeconds(30))

diff --git a/clients/java/src/main/java/io/camunda/zeebe/client/impl/oauth/OAuthCredentialsProvider.java b/clients/java/src/main/java/io/camunda/zeebe/client/impl/oauth/OAuthCredentialsProvider.java
@@ -145,7 +145,7 @@ private ZeebeClientCredentials fetchCredentials() throws IOException {
     connection.setDoOutput(true);
     connection.setReadTimeout(toIntExact(readTimeout.toMillis()));
     connection.setConnectTimeout(toIntExact(connectionTimeout.toMillis()));
-    connection.setRequestProperty("User-Agent", "zeebe-client-java/" + VersionUtil.getVersion());
+    connection.setRequestProperty("User-Agent", "camunda-client-java/" + VersionUtil.getVersion());
 
     try (final OutputStream os = connection.getOutputStream()) {
       final byte[] input = payload.getBytes(StandardCharsets.UTF_8);

diff --git a/clients/java/src/main/java/io/camunda/zeebe/client/impl/response/DeploymentEventImpl.java b/clients/java/src/main/java/io/camunda/zeebe/client/impl/response/DeploymentEventImpl.java
@@ -35,7 +35,7 @@ public final class DeploymentEventImpl implements DeploymentEvent {
   private static final String UNKNOWN_METADATA_WARN_MSG =
       "Expected metadata in deployment response, but encountered an unknown type of metadata."
           + " This might happen when you've updated your Zeebe cluster, but not your Zeebe client."
-          + " You may have to update the version of your zeebe-client-java dependency to resolve the issue.";
+          + " You may have to update the version of your camunda-client-java dependency to resolve the issue.";
 
   private final long key;
   private final String tenantId;

diff --git a/clients/java/src/test/java/io/camunda/zeebe/client/OAuthCredentialsProviderTest.java b/clients/java/src/test/java/io/camunda/zeebe/client/OAuthCredentialsProviderTest.java
@@ -360,7 +360,7 @@ private void mockCredentials(final String token, final String scope) {
             WireMock.post(WireMock.urlPathEqualTo("/oauth/token"))
                 .withHeader("Content-Type", equalTo("application/x-www-form-urlencoded"))
                 .withHeader("Accept", equalTo("application/json"))
-                .withHeader("User-Agent", matching("zeebe-client-java/\\d+\\.\\d+\\.\\d+.*"))
+                .withHeader("User-Agent", matching("camunda-client-java/\\d+\\.\\d+\\.\\d+.*"))
                 .withRequestBody(equalTo(encodedBody))
                 .willReturn(
                     WireMock.aResponse()

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -136,7 +136,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/operate/common/pom.xml b/operate/common/pom.xml
@@ -18,7 +18,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/operate/data-generator/pom.xml b/operate/data-generator/pom.xml
@@ -43,7 +43,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/operate/qa/backup-restore-tests/pom.xml b/operate/qa/backup-restore-tests/pom.xml
@@ -50,7 +50,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/operate/qa/data-generator/pom.xml b/operate/qa/data-generator/pom.xml
@@ -12,20 +12,19 @@
   <name>Operate QA Data Generator</name>
 
   <dependencies>
-
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>operate-importer</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>operate-qa-util</artifactId>
+      <artifactId>operate-importer</artifactId>
     </dependency>
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>operate-qa-util</artifactId>
     </dependency>
 
     <!-- ELASTICSEARCH -->

diff --git a/operate/qa/integration-tests/pom.xml b/operate/qa/integration-tests/pom.xml
@@ -181,7 +181,7 @@
     </dependency>
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/operate/qa/migration-tests/test-fixture-110/pom.xml b/operate/qa/migration-tests/test-fixture-110/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/operate/qa/migration-tests/test-fixture-800/pom.xml b/operate/qa/migration-tests/test-fixture-800/pom.xml
@@ -31,7 +31,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/operate/qa/util/pom.xml b/operate/qa/util/pom.xml
@@ -34,7 +34,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>
@@ -135,6 +135,7 @@
         <configuration>
           <ignoredUsedUndeclaredDependencies>
             <dependency>jakarta.annotation:jakarta.annotation-api</dependency>
+            <dependency>io.camunda:zeebe-client-java</dependency>
           </ignoredUsedUndeclaredDependencies>
         </configuration>
       </plugin>

diff --git a/operate/webapp/pom.xml b/operate/webapp/pom.xml
@@ -43,7 +43,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -808,6 +808,14 @@
         <version>${project.version}</version>
       </dependency>
 
+      <!-- camunda java client -->
+
+      <dependency>
+        <groupId>io.camunda</groupId>
+        <artifactId>camunda-client-java</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <!-- sibling projects -->
 
       <dependency>
@@ -1220,6 +1228,12 @@
         <groupId>io.zeebe</groupId>
         <artifactId>zeebe-test-container</artifactId>
         <version>${version.zeebe-test-container}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.camunda</groupId>
+            <artifactId>zeebe-client-java</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -2889,6 +2903,7 @@
                 <dep>org.apache.maven.surefire:surefire-junit47</dep>
                 <dep>org.apache.maven.surefire:surefire-junit-platform</dep>
                 <dep>org.codehaus.plexus:plexus-utils</dep>
+                <dep>io.camunda:zeebe-client-java</dep>
               </ignoredUnusedDeclaredDependencies>
             </configuration>
             <executions>

diff --git a/spring-boot-starter-camunda-sdk/pom.xml b/spring-boot-starter-camunda-sdk/pom.xml
@@ -37,7 +37,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/tasklist/common/pom.xml b/tasklist/common/pom.xml
@@ -18,7 +18,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/tasklist/data-generator/pom.xml b/tasklist/data-generator/pom.xml
@@ -43,7 +43,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <!-- ELASTICSEARCH -->

diff --git a/tasklist/qa/backup-restore-tests/pom.xml b/tasklist/qa/backup-restore-tests/pom.xml
@@ -57,7 +57,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/tasklist/qa/integration-tests/pom.xml b/tasklist/qa/integration-tests/pom.xml
@@ -337,7 +337,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/tasklist/qa/migration-tests/test-fixture-810/pom.xml b/tasklist/qa/migration-tests/test-fixture-810/pom.xml
@@ -36,7 +36,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/tasklist/qa/util/pom.xml b/tasklist/qa/util/pom.xml
@@ -30,7 +30,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/tasklist/webapp/pom.xml b/tasklist/webapp/pom.xml
@@ -44,7 +44,7 @@
     <!-- ZEEBE -->
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <!-- SPRING BOOT -->

diff --git a/testing/camunda-process-test-java/pom.xml b/testing/camunda-process-test-java/pom.xml
@@ -46,7 +46,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/zeebe/benchmarks/project/pom.xml b/zeebe/benchmarks/project/pom.xml
@@ -57,7 +57,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
     </dependency>
 
     <dependency>

diff --git a/zeebe/broker/pom.xml b/zeebe/broker/pom.xml
@@ -227,7 +227,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/zeebe/clients/java/pom.xml b/zeebe/clients/java/pom.xml
@@ -0,0 +1,11 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.camunda</groupId>
+  <artifactId>zeebe-client-java</artifactId>
+  <version>8.6.0-SNAPSHOT</version>
+  <distributionManagement>
+    <relocation>
+      <artifactId>camunda-client-java</artifactId>
+    </relocation>
+  </distributionManagement>
+</project>
diff --git a/zeebe/gateway-grpc/pom.xml b/zeebe/gateway-grpc/pom.xml
@@ -194,7 +194,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/zeebe/pom.xml b/zeebe/pom.xml
@@ -36,6 +36,7 @@
     <module>gateway</module>
     <module>gateway-grpc</module>
     <module>gateway-rest</module>
+    <module>clients/java</module>
     <module>exporter-api</module>
     <module>exporter-test</module>
     <module>protocol-asserts</module>

diff --git a/zeebe/qa/integration-tests/pom.xml b/zeebe/qa/integration-tests/pom.xml
@@ -41,7 +41,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/zeebe/qa/update-tests/pom.xml b/zeebe/qa/update-tests/pom.xml
@@ -54,7 +54,7 @@
 
     <dependency>
       <groupId>io.camunda</groupId>
-      <artifactId>zeebe-client-java</artifactId>
+      <artifactId>camunda-client-java</artifactId>
       <scope>test</scope>
     </dependency>