From 48059417b53353d78e88e1ede737d0fcaf956ef4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 9 Oct 2023 12:13:42 +0100 Subject: [PATCH] Upgrade to Kafka 3.6.0 Closes gh-37777 --- spring-boot-project/spring-boot-autoconfigure/build.gradle | 4 +++- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- spring-boot-project/spring-boot-docs/build.gradle | 4 +++- .../spring-boot-smoke-test-kafka/build.gradle | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 25d1111499..452c3e2235 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -241,7 +241,9 @@ dependencies { testImplementation("org.springframework:spring-test") testImplementation("org.springframework:spring-core-test") testImplementation("org.springframework.graphql:spring-graphql-test") - testImplementation("org.springframework.kafka:spring-kafka-test") + testImplementation("org.springframework.kafka:spring-kafka-test") { + exclude group: "commons-logging", module: "commons-logging" + } testImplementation("org.springframework.pulsar:spring-pulsar-cache-provider-caffeine") testImplementation("org.springframework.security:spring-security-test") testImplementation("org.testcontainers:cassandra") diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 972397d2ee..7f4231c041 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -752,7 +752,7 @@ bom { ] } } - library("Kafka", "3.5.1") { + library("Kafka", "3.6.0") { group("org.apache.kafka") { modules = [ "connect", diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 818d34df17..fed9578b54 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -162,7 +162,9 @@ dependencies { implementation("org.springframework.graphql:spring-graphql") implementation("org.springframework.graphql:spring-graphql-test") implementation("org.springframework.kafka:spring-kafka") - implementation("org.springframework.kafka:spring-kafka-test") + implementation("org.springframework.kafka:spring-kafka-test") { + exclude group: "commons-logging", module: "commons-logging" + } implementation("org.springframework.pulsar:spring-pulsar") implementation("org.springframework.pulsar:spring-pulsar-reactive") implementation("org.springframework.restdocs:spring-restdocs-mockmvc") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle index 33a82ff144..abe8f0e0f3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle @@ -11,5 +11,7 @@ dependencies { testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation("org.awaitility:awaitility") - testImplementation("org.springframework.kafka:spring-kafka-test") + testImplementation("org.springframework.kafka:spring-kafka-test") { + exclude group: "commons-logging", module: "commons-logging" + } }