From 2801131da705c56e238a3871d79dbb4aad7fa776 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Tue, 30 Jul 2024 14:43:24 -0500 Subject: [PATCH] Update to Pulsar 3.3.0 (#763) Resolves #757 --- gradle/libs.versions.toml | 2 +- .../sample-failover-custom-router/compose.yaml | 2 +- .../sample-imperative-produce-consume/compose.yaml | 2 +- spring-pulsar-sample-apps/sample-pulsar-binder/compose.yaml | 2 +- .../sample-pulsar-functions/download-connectors.sh | 4 ++-- spring-pulsar-sample-apps/sample-pulsar-reader/compose.yaml | 2 +- spring-pulsar-sample-apps/sample-reactive/compose.yaml | 2 +- .../pulsar/core/CachingPulsarProducerFactory.java | 1 + tools/pulsar/docker/standalone/pulsar-start.sh | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f06eac03..f317ce21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ micrometer = "1.13.2" micrometer-docs-gen = "1.0.3" micrometer-tracing = "1.3.2" protobuf = "3.25.4" -pulsar = "3.2.3" +pulsar = "3.3.0" pulsar-reactive = "0.5.6" reactor = "2023.0.8" spring = "6.1.11" diff --git a/spring-pulsar-sample-apps/sample-failover-custom-router/compose.yaml b/spring-pulsar-sample-apps/sample-failover-custom-router/compose.yaml index d8bc84ae..6ab2dc9b 100644 --- a/spring-pulsar-sample-apps/sample-failover-custom-router/compose.yaml +++ b/spring-pulsar-sample-apps/sample-failover-custom-router/compose.yaml @@ -1,6 +1,6 @@ services: pulsar: - image: 'apachepulsar/pulsar:3.2.3' + image: 'apachepulsar/pulsar:3.3.0' ports: - '6650' - '8080' diff --git a/spring-pulsar-sample-apps/sample-imperative-produce-consume/compose.yaml b/spring-pulsar-sample-apps/sample-imperative-produce-consume/compose.yaml index d8bc84ae..6ab2dc9b 100644 --- a/spring-pulsar-sample-apps/sample-imperative-produce-consume/compose.yaml +++ b/spring-pulsar-sample-apps/sample-imperative-produce-consume/compose.yaml @@ -1,6 +1,6 @@ services: pulsar: - image: 'apachepulsar/pulsar:3.2.3' + image: 'apachepulsar/pulsar:3.3.0' ports: - '6650' - '8080' diff --git a/spring-pulsar-sample-apps/sample-pulsar-binder/compose.yaml b/spring-pulsar-sample-apps/sample-pulsar-binder/compose.yaml index d8bc84ae..6ab2dc9b 100644 --- a/spring-pulsar-sample-apps/sample-pulsar-binder/compose.yaml +++ b/spring-pulsar-sample-apps/sample-pulsar-binder/compose.yaml @@ -1,6 +1,6 @@ services: pulsar: - image: 'apachepulsar/pulsar:3.2.3' + image: 'apachepulsar/pulsar:3.3.0' ports: - '6650' - '8080' diff --git a/spring-pulsar-sample-apps/sample-pulsar-functions/download-connectors.sh b/spring-pulsar-sample-apps/sample-pulsar-functions/download-connectors.sh index eee2c191..086072a7 100755 --- a/spring-pulsar-sample-apps/sample-pulsar-functions/download-connectors.sh +++ b/spring-pulsar-sample-apps/sample-pulsar-functions/download-connectors.sh @@ -2,6 +2,6 @@ mkdir connectors cd connectors -wget https://archive.apache.org/dist/pulsar/pulsar-3.2.3/connectors/pulsar-io-cassandra-3.2.3.nar -wget https://archive.apache.org/dist/pulsar/pulsar-3.2.3/connectors/pulsar-io-rabbitmq-3.2.3.nar +wget https://archive.apache.org/dist/pulsar/pulsar-3.3.0/connectors/pulsar-io-cassandra-3.3.0.nar +wget https://archive.apache.org/dist/pulsar/pulsar-3.3.0/connectors/pulsar-io-rabbitmq-3.3.0.nar cd .. diff --git a/spring-pulsar-sample-apps/sample-pulsar-reader/compose.yaml b/spring-pulsar-sample-apps/sample-pulsar-reader/compose.yaml index d8bc84ae..6ab2dc9b 100644 --- a/spring-pulsar-sample-apps/sample-pulsar-reader/compose.yaml +++ b/spring-pulsar-sample-apps/sample-pulsar-reader/compose.yaml @@ -1,6 +1,6 @@ services: pulsar: - image: 'apachepulsar/pulsar:3.2.3' + image: 'apachepulsar/pulsar:3.3.0' ports: - '6650' - '8080' diff --git a/spring-pulsar-sample-apps/sample-reactive/compose.yaml b/spring-pulsar-sample-apps/sample-reactive/compose.yaml index d8bc84ae..6ab2dc9b 100644 --- a/spring-pulsar-sample-apps/sample-reactive/compose.yaml +++ b/spring-pulsar-sample-apps/sample-reactive/compose.yaml @@ -1,6 +1,6 @@ services: pulsar: - image: 'apachepulsar/pulsar:3.2.3' + image: 'apachepulsar/pulsar:3.3.0' ports: - '6650' - '8080' diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/core/CachingPulsarProducerFactory.java b/spring-pulsar/src/main/java/org/springframework/pulsar/core/CachingPulsarProducerFactory.java index 261b7266..c3fa4cb7 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/core/CachingPulsarProducerFactory.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/core/CachingPulsarProducerFactory.java @@ -304,6 +304,7 @@ public class CachingPulsarProducerFactory extends DefaultPulsarProducerFactor } @Override + @SuppressWarnings("deprecation") public ProducerStats getStats() { return this.producer.getStats(); } diff --git a/tools/pulsar/docker/standalone/pulsar-start.sh b/tools/pulsar/docker/standalone/pulsar-start.sh index 42720459..9fd9aadb 100755 --- a/tools/pulsar/docker/standalone/pulsar-start.sh +++ b/tools/pulsar/docker/standalone/pulsar-start.sh @@ -3,5 +3,5 @@ docker run -it -p 6650:6650 -p 8080:8080 \ --mount source=pulsardata,target=/pulsar/data \ --mount source=pulsarconf,target=/pulsar/conf \ - apachepulsar/pulsar:3.2.3 \ + apachepulsar/pulsar:3.3.0 \ bin/pulsar standalone