From 77a20cc059cb7248d435bfc3ce50809aeeb83b2f Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Thu, 14 Sep 2023 19:17:40 -0500
Subject: [PATCH] Update Pulsar binder to SCSt 4.1.0-SNAPSHOT (#446)

The Pulsar binder moved from this repo to SCSt repo.
This commit updates to use the new Pulsar binder.
---
 gradle.properties                                         | 8 ++------
 spring-pulsar-docs/spring-pulsar-docs.gradle              | 1 -
 .../src/main/asciidoc/attributes-variables.adoc           | 1 -
 spring-pulsar-docs/src/main/asciidoc/pulsar-binder.adoc   | 8 ++++----
 .../sample-pulsar-binder/build.gradle                     | 2 +-
 .../sample-signup-app/build.gradle                        | 2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 233a52b6..e0305146 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,12 +6,8 @@ org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Df
 
 pulsarClientVersion=3.1.0
 pulsarClientReactiveVersion=0.3.0
+springFrameworkVersion=6.1.0-M4
 
 # only used by docs, tests, and samples (unpublished deps)
 springBootVersion=3.2.0-SNAPSHOT
-
-springFrameworkVersion=6.1.0-M4
-
-# these are temp until autoconfig moves into boot
-springPulsarBinderVersion=0.2.1-SNAPSHOT
-springCloudStreamVersion=4.0.3
+springCloudStreamVersion=4.1.0-SNAPSHOT
diff --git a/spring-pulsar-docs/spring-pulsar-docs.gradle b/spring-pulsar-docs/spring-pulsar-docs.gradle
index c6de3d1a..f711198d 100644
--- a/spring-pulsar-docs/spring-pulsar-docs.gradle
+++ b/spring-pulsar-docs/spring-pulsar-docs.gradle
@@ -89,7 +89,6 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
 				"spring-framework-version": project.springFrameworkVersion ?: 'current',
 				"spring-cloud-stream-version": project.springCloudStreamVersion ?: 'current',
 				"spring-pulsar-version": project.version,
-				"spring-pulsar-binder-version": project.springPulsarBinderVersion ?: 'current',
 				"pulsar-client-version": project.pulsarClientVersion ?: 'current',
 				"pulsar-client-reactive-version": project.pulsarClientReactiveVersion ?: 'current',
 				"is-snapshot-version": project.version.endsWith("-SNAPSHOT")
diff --git a/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc b/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc
index b16c9037..cc918b8d 100644
--- a/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc
+++ b/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc
@@ -2,7 +2,6 @@
 :spring-framework-version: current
 :spring-cloud-stream-version: current
 :spring-pulsar-version: current
-:spring-pulsar-binder-version: current
 :pulsar-client-version: current
 :pulsar-client-reactive-version: current
 :is-snapshot-version:  false
diff --git a/spring-pulsar-docs/src/main/asciidoc/pulsar-binder.adoc b/spring-pulsar-docs/src/main/asciidoc/pulsar-binder.adoc
index ee673d0c..8b8ac855 100644
--- a/spring-pulsar-docs/src/main/asciidoc/pulsar-binder.adoc
+++ b/spring-pulsar-docs/src/main/asciidoc/pulsar-binder.adoc
@@ -16,9 +16,9 @@ We need to include the following dependency on your application to use Apache Pu
 ----
 <dependencies>
     <dependency>
-        <groupId>org.springframework.pulsar</groupId>
-        <artifactId>spring-pulsar-spring-cloud-stream-binder</artifactId>
-        <version>{spring-pulsar-binder-version}</version>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-stream-binder-pulsar</artifactId>
+        <version>{spring-cloud-stream-version}</version>
     </dependency>
 </dependencies>
 ----
@@ -27,7 +27,7 @@ We need to include the following dependency on your application to use Apache Pu
 .Gradle
 ----
 dependencies {
-    implementation 'org.springframework.pulsar:spring-pulsar-spring-cloud-stream-binder:{spring-pulsar-binder-version}'
+    implementation 'org.springframework.cloud:spring-cloud-stream-binder-pulsar:{spring-cloud-stream-version}'
 }
 ----
 
diff --git a/spring-pulsar-sample-apps/sample-pulsar-binder/build.gradle b/spring-pulsar-sample-apps/sample-pulsar-binder/build.gradle
index d8329936..02880c2e 100644
--- a/spring-pulsar-sample-apps/sample-pulsar-binder/build.gradle
+++ b/spring-pulsar-sample-apps/sample-pulsar-binder/build.gradle
@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
 	implementation "org.springframework.boot:spring-boot-starter-pulsar:${springBootVersion}"
-	implementation "org.springframework.pulsar:spring-pulsar-spring-cloud-stream-binder:${springPulsarBinderVersion}"
+	implementation "org.springframework.cloud:spring-cloud-stream-binder-pulsar:${springCloudStreamVersion}"
 }
 
 bootRun {
diff --git a/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-app/build.gradle b/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-app/build.gradle
index f427f184..c7db3f06 100644
--- a/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-app/build.gradle
+++ b/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-app/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-	implementation "org.springframework.pulsar:spring-pulsar-spring-cloud-stream-binder:${springPulsarBinderVersion}"
+	implementation "org.springframework.cloud:spring-cloud-stream-binder-pulsar:${springCloudStreamVersion}"
 	implementation "org.springframework.boot:spring-boot-starter-pulsar:${springBootVersion}"
 	implementation 'org.springframework.boot:spring-boot-starter-amqp'
 	implementation 'org.springframework.boot:spring-boot-starter-data-cassandra'