chore(bump): bump java version to 21

sixdouglas · sixdouglas · commit ded608b8e44e · 2024-12-09T21:52:06.000+01:00
- kafka client: 3.3.1 -&gt; 3.8.0
- aspectj: 1.9.9.1 -&gt; 1.9.21

Maven Plugins:
- clean: 3.2.0 -&gt; 3.4.0
- compile: 3.10.1 -&gt; 3.13.0
- resources: 3.2.0 -&gt; 3.3.1
- surefire: 3.1.2 -&gt; 3.5.1
- openapi generator : 6.6.0 -&gt; 7.9.0
- springdoc openapi webflux: 1.2.32 -&gt; 1.8.0
- surefire: 3.2.3 -&gt; 3.5.1 (for e2e tests)
- surefire-ng: 3.2.5 -&gt; 3.5.1 (for e2e tests)

# Conflicts:
#	api/Dockerfile
#	documentation/compose/e2e-tests.yaml
#	frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
#	pom.xml
diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
       - name: Build
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
       - name: Build
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/cve_checks.yml b/.github/workflows/cve_checks.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/e2e-run.yml b/.github/workflows/e2e-run.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
@@ -72,7 +72,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/release-serde-api.yml b/.github/workflows/release-serde-api.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: "17"
+          java-version: "21"
           distribution: "zulu"
           cache: "maven"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
 
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
       - name: Build
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,7 +1,7 @@
-# The tag is ignored when a sha is included but the reason to add it are:  
+# The tag is ignored when a sha is included but the reason to add it are:
 # 1. Self Documentation: It is difficult to find out what the expected tag is given a sha alone
 # 2. Helps dependabot during discovery of upgrades
-FROM azul/zulu-openjdk-alpine:17-jre-headless-latest@sha256:af4df00adaec356d092651af50d9e80fd179f96722d267e79acb564aede10fda
+FROM azul/zulu-openjdk-alpine:21.0.4-jre-headless@sha256:c6f58ac023a103283fd02d204462268ae5e29996bfe379f6cf11837355e93c98
 
 RUN apk add --no-cache \
     # snappy codec
diff --git a/api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java b/api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java
@@ -176,7 +176,7 @@ public Mono<ResponseEntity<Map<String, ConnectorTopics>>> getConnectorTopicsWith
   }
 
   @Override
-  public Flux<String> getConnectors(String search) throws WebClientResponseException {
+  public Mono<List<String>> getConnectors(String search) throws WebClientResponseException {
     return withRetryOnConflict(super.getConnectors(search));
   }
 
diff --git a/api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java b/api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java
@@ -149,6 +149,8 @@ private Mono<List<ConsumerGroupDescription>> loadSortedDescriptions(ReactiveAdmi
               case EMPTY -> 3;
               case DEAD -> 4;
               case UNKNOWN -> 5;
+              case ASSIGNING -> 6;
+              case RECONCILING -> 7;
             };
         var comparator = Comparator.comparingInt(statesPriorities);
         yield loadDescriptionsByListings(ac, groups, comparator, pageNum, perPage, sortOrderDto);
diff --git a/api/src/main/java/io/kafbat/ui/service/KafkaConnectService.java b/api/src/main/java/io/kafbat/ui/service/KafkaConnectService.java
@@ -106,9 +106,9 @@ public Mono<ConnectorTopics> getConnectorTopics(KafkaCluster cluster, String con
 
   public Flux<String> getConnectorNames(KafkaCluster cluster, String connectName) {
     return api(cluster, connectName)
-        .flux(client -> client.getConnectors(null))
+        .mono(client -> client.getConnectors(null))
         // for some reason `getConnectors` method returns the response as a single string
-        .collectList().map(e -> e.get(0))
+        .map(List::getFirst)
         .map(this::parseConnectorsNamesStringToList)
         .flatMapMany(Flux::fromIterable);
   }
diff --git a/documentation/compose/connectors/start.sh b/documentation/compose/connectors/start.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' kafka-connect0:8083)" != "200" ]]
     do sleep 5
 done
diff --git a/documentation/compose/e2e-tests.yaml b/documentation/compose/e2e-tests.yaml
@@ -150,15 +150,15 @@ services:
       POSTGRES_PASSWORD: '12345'
 
   create-connectors:
-    image: ellerbrock/alpine-bash-curl-ssl
+    image: curlimages/curl
     depends_on:
       postgres-db:
         condition: service_healthy
       kafka-connect0:
         condition: service_healthy
     volumes:
       - ./connectors:/connectors
-    command: bash -c '/connectors/start.sh'
+    command: sh -c '/connectors/start.sh'
 
   ksqldb:
     image: confluentinc/cp-ksqldb-server:7.6.0
diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
@@ -12,12 +12,12 @@
     <artifactId>e2e-tests</artifactId>
 
     <properties>
-        <kafka.version>3.3.1</kafka.version>
+        <kafka.version>3.8.0</kafka.version>
         <contract>${project.version}</contract>
-        <maven.compiler.release>17</maven.compiler.release>
-        <maven.surefire.release>3.2.3</maven.surefire.release>
-        <maven.surefire-testng>3.2.5</maven.surefire-testng>
-        <aspectj.version>1.9.9.1</aspectj.version>
+        <maven.compiler.release>21</maven.compiler.release>
+        <maven.surefire.release>3.5.1</maven.surefire.release>
+        <maven.surefire-testng>3.5.1</maven.surefire-testng>
+        <aspectj.version>1.9.21</aspectj.version>
         <allure.version>2.27.0</allure.version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     </modules>
 
     <properties>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <frontend-generated-sources-directory>..//frontend/src/generated-sources
@@ -39,7 +39,7 @@
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>
-        <kafka-clients.version>3.7.1</kafka-clients.version>
+        <kafka-clients.version>3.8.0</kafka-clients.version>
         <org.mapstruct.version>1.6.2</org.mapstruct.version>
         <org.projectlombok.version>1.18.34</org.projectlombok.version>
         <protobuf-java.version>3.25.5</protobuf-java.version>
@@ -63,14 +63,14 @@
         <pnpm.version>v9.11.0</pnpm.version>
 
         <!-- Plugin versions -->
-        <fabric8-maven-plugin.version>0.42.1</fabric8-maven-plugin.version>
-        <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
-        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <openapi-generator-maven-plugin.version>6.6.0</openapi-generator-maven-plugin.version>
-        <springdoc-openapi-webflux-ui.version>1.2.32</springdoc-openapi-webflux-ui.version>
+        <fabric8-maven-plugin.version>0.45.1</fabric8-maven-plugin.version>
+        <frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
+        <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+        <maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+        <openapi-generator-maven-plugin.version>7.9.0</openapi-generator-maven-plugin.version>
+        <springdoc-openapi-webflux-ui.version>1.8.0</springdoc-openapi-webflux-ui.version>
     </properties>
 
     <repositories>
diff --git a/serde-api/pom.xml b/serde-api/pom.xml
@@ -8,8 +8,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <distributionManagement>
