From 629777b7c7190b13e88633cd99df6726f4ef8950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 12 Sep 2025 11:21:19 +0200 Subject: [PATCH] Upgrade to Pulsar 4.1.0 Closes gh-47170 --- documentation/spring-boot-docs/build.gradle | 8 ++------ module/spring-boot-pulsar/build.gradle | 8 ++------ platform/spring-boot-dependencies/build.gradle | 2 +- starter/spring-boot-starter-pulsar-reactive/build.gradle | 4 +--- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle index 0637265e0e2..4401942f26d 100644 --- a/documentation/spring-boot-docs/build.gradle +++ b/documentation/spring-boot-docs/build.gradle @@ -179,12 +179,8 @@ dependencies { implementation("org.springframework.graphql:spring-graphql-test") implementation("org.springframework.kafka:spring-kafka") implementation("org.springframework.kafka:spring-kafka-test") - implementation("org.springframework.pulsar:spring-pulsar") { - exclude group: "commons-logging", module: "commons-logging" - } - implementation("org.springframework.pulsar:spring-pulsar-reactive") { - 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") implementation("org.springframework.restdocs:spring-restdocs-restassured") implementation("org.springframework.restdocs:spring-restdocs-webtestclient") diff --git a/module/spring-boot-pulsar/build.gradle b/module/spring-boot-pulsar/build.gradle index 01dde085abc..81382c4d72f 100644 --- a/module/spring-boot-pulsar/build.gradle +++ b/module/spring-boot-pulsar/build.gradle @@ -27,16 +27,12 @@ description = "Spring Boot Pulsar" dependencies { api(project(":module:spring-boot-tx")) - api("org.springframework.pulsar:spring-pulsar") { - exclude group: "commons-logging", module: "commons-logging" - } + api("org.springframework.pulsar:spring-pulsar") optional(project(":core:spring-boot-autoconfigure")) optional(project(":core:spring-boot-docker-compose")) optional(project(":core:spring-boot-testcontainers")) - optional("org.springframework.pulsar:spring-pulsar-reactive") { - exclude group: "commons-logging", module: "commons-logging" - } + optional("org.springframework.pulsar:spring-pulsar-reactive") optional("org.testcontainers:pulsar") dockerTestImplementation(project(":core:spring-boot-test")) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 8042626d1c6..d33cca10492 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1771,7 +1771,7 @@ bom { releaseNotes("https://github.com/prometheus/client_java/releases/tag/parent-{version}") } } - library("Pulsar", "4.0.6") { + library("Pulsar", "4.1.0") { group("org.apache.pulsar") { bom("pulsar-bom") { permit("org.apache.maven.plugin-tools:maven-plugin-annotations") diff --git a/starter/spring-boot-starter-pulsar-reactive/build.gradle b/starter/spring-boot-starter-pulsar-reactive/build.gradle index 5efe208e947..80fcfbc0524 100644 --- a/starter/spring-boot-starter-pulsar-reactive/build.gradle +++ b/starter/spring-boot-starter-pulsar-reactive/build.gradle @@ -25,9 +25,7 @@ dependencies { api(project(":module:spring-boot-pulsar")) api(project(":module:spring-boot-reactor")) - api("org.springframework.pulsar:spring-pulsar-reactive") { - exclude group: "commons-logging", module: "commons-logging" - } + api("org.springframework.pulsar:spring-pulsar-reactive") } checkRuntimeClasspathForConflicts {