From 815bdc528bf1cd41448d2a96f6df71c022d6347d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 7 Aug 2025 14:21:17 +0200 Subject: [PATCH] Upgrade to Pulsar 3.3.8 Closes gh-46716 --- .../spring-boot-autoconfigure/build.gradle | 12 +++++++++--- .../spring-boot-dependencies/build.gradle | 2 +- spring-boot-project/spring-boot-docs/build.gradle | 8 ++++++-- .../spring-boot-starter-pulsar-reactive/build.gradle | 4 +++- .../spring-boot-starter-pulsar/build.gradle | 4 +++- .../spring-boot-testcontainers/build.gradle | 8 ++++++-- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 9febd3924cc..02eec5d533a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -53,7 +53,9 @@ dependencies { dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:mongodb") dockerTestImplementation("org.testcontainers:neo4j") - dockerTestImplementation("org.testcontainers:pulsar") + dockerTestImplementation("org.testcontainers:pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } dockerTestImplementation("org.testcontainers:testcontainers") optional("co.elastic.clients:elasticsearch-java") { @@ -210,8 +212,12 @@ dependencies { optional("org.springframework.data:spring-data-redis") optional("org.springframework.graphql:spring-graphql") optional("org.springframework.hateoas:spring-hateoas") - optional("org.springframework.pulsar:spring-pulsar") - optional("org.springframework.pulsar:spring-pulsar-reactive") + optional("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } + optional("org.springframework.pulsar:spring-pulsar-reactive") { + exclude group: "commons-logging", module: "commons-logging" + } optional("org.springframework.security:spring-security-acl") optional("org.springframework.security:spring-security-config") optional("org.springframework.security:spring-security-data") { diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 04269e62614..0863a1b4016 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1716,7 +1716,7 @@ bom { releaseNotes("https://github.com/prometheus/client_java/releases/tag/parent-{version}") } } - library("Pulsar", "3.3.7") { + library("Pulsar", "3.3.8") { group("org.apache.pulsar") { bom("pulsar-bom") { permit("org.apache.maven.plugin-tools:maven-plugin-annotations") diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 4fa6d765328..2bbd49dd05f 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -160,8 +160,12 @@ dependencies { 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.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.restdocs:spring-restdocs-mockmvc") implementation("org.springframework.restdocs:spring-restdocs-restassured") implementation("org.springframework.restdocs:spring-restdocs-webtestclient") diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle index 672670780c8..0a71a42c112 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle @@ -22,7 +22,9 @@ description = "Starter for using Spring for Apache Pulsar Reactive" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) - api("org.springframework.pulsar:spring-pulsar-reactive") + api("org.springframework.pulsar:spring-pulsar-reactive") { + exclude group: "commons-logging", module: "commons-logging" + } } checkRuntimeClasspathForConflicts { diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle index f9e8a895276..69505deadb6 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle @@ -22,7 +22,9 @@ description = "Starter for using Spring for Apache Pulsar" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) - api("org.springframework.pulsar:spring-pulsar") + api("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } } checkRuntimeClasspathForConflicts { diff --git a/spring-boot-project/spring-boot-testcontainers/build.gradle b/spring-boot-project/spring-boot-testcontainers/build.gradle index 18b786907b3..aacc89bd685 100644 --- a/spring-boot-project/spring-boot-testcontainers/build.gradle +++ b/spring-boot-project/spring-boot-testcontainers/build.gradle @@ -65,7 +65,9 @@ dependencies { dockerTestImplementation("org.springframework.data:spring-data-redis") dockerTestImplementation("org.springframework.kafka:spring-kafka") dockerTestImplementation("org.springframework.ldap:spring-ldap-core") - dockerTestImplementation("org.springframework.pulsar:spring-pulsar") + dockerTestImplementation("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") @@ -114,7 +116,9 @@ dependencies { testImplementation("org.springframework.amqp:spring-rabbit") testImplementation("org.springframework.data:spring-data-redis") testImplementation("org.springframework.kafka:spring-kafka") - testImplementation("org.springframework.pulsar:spring-pulsar") + testImplementation("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } testImplementation("org.testcontainers:junit-jupiter") }