From fe1e93e48c1b516df74ba5f0ed5793c9acaaa7b3 Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Tue, 9 Jan 2024 17:47:10 -0600
Subject: [PATCH] Update to Pulsar 3.1.2 (#538)

Resolves #534
---
 gradle/libs.versions.toml                           |  2 +-
 .../pages/appendix/override-boot-dependencies.adoc  | 13 ++++++-------
 .../sample-failover-custom-router/compose.yaml      |  2 +-
 .../sample-imperative-produce-consume/compose.yaml  |  2 +-
 .../sample-pulsar-functions/download-connectors.sh  |  4 ++--
 .../test/support/PulsarTestContainerSupport.java    |  2 +-
 tools/pulsar/docker/standalone/pulsar-start.sh      |  2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 92721b4d..06937e62 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ micrometer = "1.12.1"
 micrometer-docs-gen = "1.0.0"
 micrometer-tracing = "1.2.1"
 protobuf = "3.21.5"
-pulsar = "3.1.1"
+pulsar = "3.1.2"
 pulsar-reactive = "0.5.1"
 reactor = "2023.0.1"
 spring = "6.1.2"
diff --git a/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/override-boot-dependencies.adoc b/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/override-boot-dependencies.adoc
index 34ede919..2071c761 100644
--- a/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/override-boot-dependencies.adoc
+++ b/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/override-boot-dependencies.adoc
@@ -11,9 +11,9 @@ In the following example, snapshot version of the Pulsar clients and Spring for
 [source, groovy, subs="+attributes", role="secondary"]
 .Gradle
 ----
-ext['pulsar.version'] = '3.1.1-SNAPSHOT'
-ext['pulsar-reactive.version'] = '0.3.1-SNAPSHOT'
-ext['spring-pulsar.version'] = '1.0.1-SNAPSHOT'
+ext['pulsar.version'] = '3.1.2-SNAPSHOT'
+ext['pulsar-reactive.version'] = '0.5.1-SNAPSHOT'
+ext['spring-pulsar.version'] = '1.0.2-SNAPSHOT'
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-pulsar-reactive'
@@ -27,9 +27,9 @@ Maven::
 [source, xml, subs="+attributes", role="primary"]
 ----
 <properties>
-    <pulsar.version>3.1.1-SNAPSHOT</pulsar.version>
-    <pulsar-reactive.version>0.3.1-SNAPSHOT</pulsar-reactive.version>
-    <spring-pulsar.version>1.0.1-SNAPSHOT</spring-pulsar.version>
+    <pulsar.version>3.1.2-SNAPSHOT</pulsar.version>
+    <pulsar-reactive.version>0.5.1-SNAPSHOT</pulsar-reactive.version>
+    <spring-pulsar.version>1.0.2-SNAPSHOT</spring-pulsar.version>
 </properties>
 
 <dependency>
@@ -38,4 +38,3 @@ Maven::
 </dependency>
 ----
 ======
-
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 013e7f4a..39df55a5 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.1.1'
+    image: 'apachepulsar/pulsar:3.1.2'
     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 013e7f4a..39df55a5 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.1.1'
+    image: 'apachepulsar/pulsar:3.1.2'
     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 2c6e85e7..4c120178 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.1.1/connectors/pulsar-io-cassandra-3.1.1.nar
-wget https://archive.apache.org/dist/pulsar/pulsar-3.1.1/connectors/pulsar-io-rabbitmq-3.1.1.nar
+wget https://archive.apache.org/dist/pulsar/pulsar-3.1.2/connectors/pulsar-io-cassandra-3.1.2.nar
+wget https://archive.apache.org/dist/pulsar/pulsar-3.1.2/connectors/pulsar-io-rabbitmq-3.1.2.nar
 cd ..
diff --git a/spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/PulsarTestContainerSupport.java b/spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/PulsarTestContainerSupport.java
index cb4e4b34..c68aeb05 100644
--- a/spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/PulsarTestContainerSupport.java
+++ b/spring-pulsar-test/src/main/java/org/springframework/pulsar/test/support/PulsarTestContainerSupport.java
@@ -41,7 +41,7 @@ public interface PulsarTestContainerSupport {
 	}
 
 	static DockerImageName getPulsarImage() {
-		return DockerImageName.parse("apachepulsar/pulsar:3.1.1");
+		return DockerImageName.parse("apachepulsar/pulsar:3.1.2");
 	}
 
 	static String getHttpServiceUrl() {
diff --git a/tools/pulsar/docker/standalone/pulsar-start.sh b/tools/pulsar/docker/standalone/pulsar-start.sh
index 982fe08f..9a7b9a2c 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.1.1 \
+  apachepulsar/pulsar:3.1.2 \
   bin/pulsar standalone