From f9eb45d9b7b8081e48ea76ca30953ec92df034e6 Mon Sep 17 00:00:00 2001 From: dejan2609 Date: Sat, 18 Oct 2025 09:15:27 +0200 Subject: [PATCH 1/3] KAFKA-19809 CheckStyle version upgrade: 10.20.2 -->> 12.0.1 related link: https://checkstyle.org/releasenotes.html#Release_12.0.1 --- checkstyle/checkstyle.xml | 4 ++-- checkstyle/suppressions.xml | 4 ++++ .../kafka/common/requests/TxnOffsetCommitRequest.java | 2 +- gradle/dependencies.gradle | 2 +- .../coordinator/group/GroupCoordinatorService.java | 4 ++-- .../controller/DelegationTokenControlManager.java | 10 +++++----- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 51cfe3dcb7e65..67b9a9297a7fa 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -126,7 +126,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml index d363b9ed9c0d0..bce6cbbf8c3c4 100644 --- a/checkstyle/suppressions.xml +++ b/checkstyle/suppressions.xml @@ -371,4 +371,8 @@ + + + + diff --git a/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java index 3724c4ccc0920..8d9f4d8f39cf1 100644 --- a/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java +++ b/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java @@ -96,7 +96,7 @@ public Builder(final TxnOffsetCommitRequestData data) { public TxnOffsetCommitRequest build(short version) { if (version < 3 && groupMetadataSet()) { throw new UnsupportedVersionException("Broker doesn't support group metadata commit API on version " + version - + ", minimum supported request version is 3 which requires brokers to be on version 2.5 or above."); + + ", minimum supported request version is 3 which requires brokers to be on version 2.5 or above."); } if (!isTransactionV2Enabled) { version = (short) Math.min(version, LAST_STABLE_VERSION_BEFORE_TRANSACTION_V2); diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 91f9e1095c393..c5bd746a3dd79 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -56,7 +56,7 @@ versions += [ bcpkix: "1.80", caffeine: "3.2.0", bndlib: "7.1.0", - checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "10.20.2", + checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.0.1", commonsLang: "3.18.0", commonsValidator: "1.10.0", classgraph: "4.8.179", diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java index 3cb59ca3f81ec..8abb1e660ca3a 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java @@ -2343,11 +2343,11 @@ private OffsetFetchResponseData.OffsetFetchResponseGroup handleOffsetFetchExcept // NOT_ENOUGH_REPLICAS and REQUEST_TIMED_OUT to COORDINATOR_NOT_AVAILABLE, // COORDINATOR_NOT_AVAILABLE is also not handled by consumers on versions prior to // 3.9. - OffsetFetchResponse.groupError( + OffsetFetchResponse.groupError( request, Errors.NOT_COORDINATOR, context.requestVersion() - ); + ); default -> handleOperationException( operationName, request, diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java index 050313d156f74..4f9436637f072 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java @@ -100,11 +100,11 @@ DelegationTokenControlManager build() { if (logContext == null) logContext = new LogContext(); if (tokenCache == null) tokenCache = new DelegationTokenCache(Set.of()); return new DelegationTokenControlManager( - logContext, - tokenCache, - tokenSecretKeyString, - tokenDefaultMaxLifetimeMs, - tokenDefaultRenewLifetimeMs); + logContext, + tokenCache, + tokenSecretKeyString, + tokenDefaultMaxLifetimeMs, + tokenDefaultRenewLifetimeMs); } } From 6f8bd4a2123f540aee25803b3c6c9216325a0799 Mon Sep 17 00:00:00 2001 From: dejan2609 Date: Mon, 20 Oct 2025 16:45:47 +0200 Subject: [PATCH 2/3] KAFKA-19809 CheckStyle version 12.1.0 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index c5bd746a3dd79..a602f3b783b2a 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -56,7 +56,7 @@ versions += [ bcpkix: "1.80", caffeine: "3.2.0", bndlib: "7.1.0", - checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.0.1", + checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.1.0", commonsLang: "3.18.0", commonsValidator: "1.10.0", classgraph: "4.8.179", From 24aa45156e25526ee9f11083cff8ce30819243e9 Mon Sep 17 00:00:00 2001 From: dejan2609 Date: Mon, 27 Oct 2025 14:29:15 +0100 Subject: [PATCH 3/3] KAFKA-19809 CheckStyle version 12.1.1 https://checkstyle.org/releasenotes.html#Release_12.1.1 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index a602f3b783b2a..0e41617e0b16a 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -56,7 +56,7 @@ versions += [ bcpkix: "1.80", caffeine: "3.2.0", bndlib: "7.1.0", - checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.1.0", + checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.1.1", commonsLang: "3.18.0", commonsValidator: "1.10.0", classgraph: "4.8.179",