From 2b9f0c3ce542f665f4b9e2d319a4c635c70b2b5a Mon Sep 17 00:00:00 2001 From: Douglas SIX Date: Sat, 19 Oct 2024 18:59:57 +0200 Subject: [PATCH] chore(bump): bump java version to 21 - kafka client: 3.3.1 -> 3.8.0 - aspectj: 1.9.9.1 -> 1.9.21 Maven Plugins: - clean: 3.2.0 -> 3.4.0 - compile: 3.10.1 -> 3.13.0 - resources: 3.2.0 -> 3.3.1 - surefire: 3.1.2 -> 3.5.1 - openapi generator : 6.6.0 -> 7.9.0 - springdoc openapi webflux: 1.2.32 -> 1.8.0 - surefire: 3.2.3 -> 3.5.1 (for e2e tests) - surefire-ng: 3.2.5 -> 3.5.1 (for e2e tests) --- .github/workflows/backend_tests.yml | 2 +- .github/workflows/branch-deploy.yml | 2 +- .github/workflows/build-public-image.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/cve_checks.yml | 2 +- .github/workflows/e2e-run.yml | 4 ++-- .github/workflows/main.yml | 2 +- .github/workflows/release-serde-api.yml | 2 +- .github/workflows/release.yml | 2 +- .../workflows/separate_env_public_create.yml | 2 +- api/Dockerfile | 2 +- .../ui/client/RetryingKafkaConnectClient.java | 2 +- .../ui/service/ConsumerGroupService.java | 2 ++ .../ui/service/KafkaConnectService.java | 4 ++-- .../main/resources/swagger/kafbat-ui-api.yaml | 1 + documentation/compose/connectors/start.sh | 2 +- documentation/compose/e2e-tests.yaml | 8 ++++---- e2e-tests/pom.xml | 10 +++++----- .../Brokers/Broker/Configs/lib/constants.ts | 2 ++ pom.xml | 20 +++++++++---------- serde-api/pom.xml | 4 ++-- 21 files changed, 42 insertions(+), 37 deletions(-) diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index abb97d149..e9e6f975c 100644 --- 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 index 720ceee3f..998e09bfe 100644 --- 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 index 3e364c992..4f37246bc 100644 --- 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 index 40fc3fb3e..e73c9576b 100644 --- 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 index 5df2d33bf..2bb98dd5a 100644 --- 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 index b79e07897..b17335215 100644 --- 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 index 7701b91e6..bf684a69b 100644 --- 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 index 36d8a8412..b1e210e45 100644 --- 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 index 3a3c9de23..6e2075b75 100644 --- 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 index 97eb8ee02..e77a15438 100644 --- 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 index 9e1173250..c4ee1514f 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.11-jre-headless +FROM azul/zulu-openjdk-alpine:21.0.4-jre-headless 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 index bb4ea92fe..f0b291af6 100644 --- 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>> getConnectorTopicsWith } @Override - public Flux getConnectors(String search) throws WebClientResponseException { + public Mono> 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 index 27593cd6f..b2d6bd20f 100644 --- 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> 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 index c5a32b29e..922bdd23b 100644 --- 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 getConnectorTopics(KafkaCluster cluster, String con public Flux 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/contract/src/main/resources/swagger/kafbat-ui-api.yaml b/contract/src/main/resources/swagger/kafbat-ui-api.yaml index 5eede6cef..04cc17514 100644 --- a/contract/src/main/resources/swagger/kafbat-ui-api.yaml +++ b/contract/src/main/resources/swagger/kafbat-ui-api.yaml @@ -3779,6 +3779,7 @@ components: - DYNAMIC_BROKER_LOGGER_CONFIG - DYNAMIC_BROKER_CONFIG - DYNAMIC_DEFAULT_BROKER_CONFIG + - DYNAMIC_CLIENT_METRICS_CONFIG - STATIC_BROKER_CONFIG - DEFAULT_CONFIG - UNKNOWN diff --git a/documentation/compose/connectors/start.sh b/documentation/compose/connectors/start.sh index 7adc5e4e1..092267591 100755 --- 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 index b8e746867..04a24872b 100644 --- a/documentation/compose/e2e-tests.yaml +++ b/documentation/compose/e2e-tests.yaml @@ -88,7 +88,7 @@ services: build: context: ./kafka-connect args: - image: confluentinc/cp-kafka-connect:6.0.1 + image: confluentinc/cp-kafka-connect:7.2.1 ports: - 8083:8083 depends_on: @@ -151,7 +151,7 @@ services: POSTGRES_PASSWORD: '12345' create-connectors: - image: ellerbrock/alpine-bash-curl-ssl + image: curlimages/curl depends_on: postgres-db: condition: service_healthy @@ -159,10 +159,10 @@ services: condition: service_healthy volumes: - ./connectors:/connectors - command: bash -c '/connectors/start.sh' + command: sh -c '/connectors/start.sh' ksqldb: - image: confluentinc/ksqldb-server:0.18.0 + image: confluentinc/cp-ksqldb-server:7.2.1 healthcheck: test: [ "CMD", "timeout", "1", "curl", "--silent", "--fail", "http://localhost:8088/info" ] interval: 30s diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml index c46bb78eb..af57383cb 100644 --- a/e2e-tests/pom.xml +++ b/e2e-tests/pom.xml @@ -12,12 +12,12 @@ e2e-tests - 3.3.1 + 3.8.0 ${project.version} - 17 - 3.2.3 - 3.2.5 - 1.9.9.1 + 21 + 3.5.1 + 3.5.1 + 1.9.21 2.27.0 diff --git a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts index 5a829323a..0911c512f 100644 --- a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts +++ b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts @@ -5,6 +5,7 @@ export const CONFIG_SOURCE_NAME_MAP: Record = { [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 'Dynamic broker logger config', [ConfigSource.DYNAMIC_BROKER_CONFIG]: 'Dynamic broker config', [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 'Dynamic default broker config', + [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]: 'Dynamic client metrics config', [ConfigSource.STATIC_BROKER_CONFIG]: 'Static broker config', [ConfigSource.DEFAULT_CONFIG]: 'Default config', [ConfigSource.UNKNOWN]: 'Unknown', @@ -15,6 +16,7 @@ export const CONFIG_SOURCE_PRIORITY = { [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 1, [ConfigSource.DYNAMIC_BROKER_CONFIG]: 1, [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 1, + [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]: 1, [ConfigSource.STATIC_BROKER_CONFIG]: 2, [ConfigSource.DEFAULT_CONFIG]: 3, [ConfigSource.UNKNOWN]: 4, diff --git a/pom.xml b/pom.xml index e38658fbb..c9a9646a3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 17 + 21 UTF-8 ..//frontend/src/generated-sources @@ -39,7 +39,7 @@ 3.1.0 3.0.13 2.14.0 - 3.5.2 + 3.8.0 1.6.2 1.18.34 3.25.5 @@ -63,14 +63,14 @@ v9.11.0 - 0.42.1 - 1.12.1 - 3.2.0 - 3.10.1 - 3.2.0 - 3.1.2 - 6.6.0 - 1.2.32 + 0.45.1 + 1.15.1 + 3.4.0 + 3.13.0 + 3.3.1 + 3.5.1 + 7.9.0 + 1.8.0 diff --git a/serde-api/pom.xml b/serde-api/pom.xml index 3c2e3b3a1..facf886d8 100644 --- a/serde-api/pom.xml +++ b/serde-api/pom.xml @@ -8,8 +8,8 @@ jar - 17 - 17 + 21 + 21