From dbd0d72b4b6fe9cf4981857851472e6ea6dd2950 Mon Sep 17 00:00:00 2001 From: onobc Date: Tue, 14 Oct 2025 11:26:42 -0500 Subject: [PATCH] Update Pulsar to 4.1.1 This commit updates the following dependency versions in preparation for the upcoming `1.0.0` release. - Pulsar from `4.0.5` to `4.1.1` - Jackson from `2.14.2` to `2.20.0` - Log4j from `2.24.3` to `2.25.2` - Reactor from `3.6.17` to `3.8.0-RC1` Signed-off-by: onobc --- gradle/libs.versions.toml | 15 ++++++++------- .../client/adapter/SingletonPulsarContainer.java | 2 +- .../reactive/client/api/MessageResultTests.java | 5 +++++ .../client/api/ReactiveMessagePipelineTests.java | 5 +++++ scripts/validate_staging_repo.sh | 4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c0aaca9..cf6ad439 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,19 +22,20 @@ assertj = "3.26.3" caffeine = "2.9.3" checkstyle = "9.3" # @pin -jackson = "2.14.2" +jackson = "2.20.0" + # @pin jctools = "3.3.0" junit-jupiter = "5.11.3" licenser = "0.6.1" -log4j = "2.24.3" -mockito = "5.18.0" -pulsar = "4.0.5" +log4j = "2.25.2" +mockito = "5.20.0" +pulsar = "4.1.1" rat-gradle = "0.8.0" -reactor = "3.6.17" +reactor = "3.8.0-RC1" slf4j = "2.0.17" -spring-javaformat = "0.0.46" -testcontainers = "1.21.1" +spring-javaformat = "0.0.47" +testcontainers = "1.21.3" testlogger = "3.2.0" [libraries] diff --git a/pulsar-client-reactive-adapter/src/intTest/java/org/apache/pulsar/reactive/client/adapter/SingletonPulsarContainer.java b/pulsar-client-reactive-adapter/src/intTest/java/org/apache/pulsar/reactive/client/adapter/SingletonPulsarContainer.java index d53e185c..1ca9420e 100644 --- a/pulsar-client-reactive-adapter/src/intTest/java/org/apache/pulsar/reactive/client/adapter/SingletonPulsarContainer.java +++ b/pulsar-client-reactive-adapter/src/intTest/java/org/apache/pulsar/reactive/client/adapter/SingletonPulsarContainer.java @@ -52,7 +52,7 @@ static PulsarAdmin createPulsarAdmin() throws PulsarClientException { } static DockerImageName getPulsarImage() { - return DockerImageName.parse("apachepulsar/pulsar:4.0.4"); + return DockerImageName.parse("apachepulsar/pulsar:4.1.1"); } } diff --git a/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/MessageResultTests.java b/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/MessageResultTests.java index eaa502f6..62e9e6b3 100644 --- a/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/MessageResultTests.java +++ b/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/MessageResultTests.java @@ -216,6 +216,11 @@ public byte[] getSchemaVersion() { return new byte[0]; } + @Override + public Optional getSchemaId() { + return Optional.empty(); + } + @Override public boolean isReplicated() { return false; diff --git a/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/ReactiveMessagePipelineTests.java b/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/ReactiveMessagePipelineTests.java index f330a54a..9e0b2555 100644 --- a/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/ReactiveMessagePipelineTests.java +++ b/pulsar-client-reactive-api/src/test/java/org/apache/pulsar/reactive/client/api/ReactiveMessagePipelineTests.java @@ -685,6 +685,11 @@ public byte[] getSchemaVersion() { return new byte[0]; } + @Override + public Optional getSchemaId() { + return Optional.empty(); + } + @Override public boolean isReplicated() { return false; diff --git a/scripts/validate_staging_repo.sh b/scripts/validate_staging_repo.sh index 2b4601b5..07d8434f 100755 --- a/scripts/validate_staging_repo.sh +++ b/scripts/validate_staging_repo.sh @@ -40,7 +40,7 @@ if ! command -v gradle &>/dev/null; then fi DOCKER_CONTAINER_NAME=pulsar-standalone-$$ -: ${DOCKER_IMAGE_NAME:=apachepulsar/pulsar:4.0.4} +: ${DOCKER_IMAGE_NAME:=apachepulsar/pulsar:4.1.1} mkdir test-app-reactive-$$ cd test-app-reactive-$$ @@ -90,7 +90,7 @@ public class HelloPulsarClientReactive { public static void main(String[] args) throws PulsarClientException, InterruptedException { // Before running this, start Pulsar within docker with this command: - // docker run -it -p 8080:8080 -p 6650:6650 apachepulsar/pulsar:4.0.4 /pulsar/bin/pulsar standalone -nss -nfw + // docker run -it -p 8080:8080 -p 6650:6650 apachepulsar/pulsar:4.1.1 /pulsar/bin/pulsar standalone -nss -nfw try (PulsarClient pulsarClient = PulsarClient.builder().serviceUrl("pulsar://localhost:6650").build()) {