From 55e9ebe293cb68fda08ecefef12ad5fddfa62d5f Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Fri, 22 Sep 2023 21:08:07 -0500 Subject: [PATCH] Update Spring Pulsar for Boot 3.2.0 compatibility The Spring Pulsar test suites were still using the legacy starter (v0.2.0) and also Pulsar 2.11.0. This commit updates to the latest versions that are compatible w/ Boot 3.2.0 See gh-189 --- cloud/cloud-stream-pulsar/build.gradle | 11 +++++------ cloud/cloud-stream-pulsar/docker-compose.yml | 3 ++- .../src/main/resources/application.yml | 2 +- integration/spring-pulsar-reactive/build.gradle | 15 ++++++++++----- .../spring-pulsar-reactive/docker-compose.yml | 3 ++- .../src/main/resources/application.properties | 8 +++++++- integration/spring-pulsar/build.gradle | 11 ++++++----- integration/spring-pulsar/docker-compose.yml | 3 ++- .../src/main/resources/application.properties | 2 +- 9 files changed, 36 insertions(+), 22 deletions(-) diff --git a/cloud/cloud-stream-pulsar/build.gradle b/cloud/cloud-stream-pulsar/build.gradle index adac20f4..f80d5d5b 100644 --- a/cloud/cloud-stream-pulsar/build.gradle +++ b/cloud/cloud-stream-pulsar/build.gradle @@ -5,17 +5,16 @@ plugins { id "org.graalvm.buildtools.native" } -ext { - set("springPulsarVersion", "0.2.1-SNAPSHOT") -} - dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")) implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.cloud:spring-cloud-stream") - implementation("org.springframework.pulsar:spring-pulsar-spring-boot-starter:${springPulsarVersion}") - implementation("org.springframework.pulsar:spring-pulsar-spring-cloud-stream-binder:${springPulsarVersion}") + implementation("org.springframework.boot:spring-boot-starter-pulsar") + // TODO remove constraints once Boot goes back to snapshots + constraints { + implementation('org.springframework.pulsar:spring-pulsar:1.0.0-SNAPSHOT') + } testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/cloud/cloud-stream-pulsar/docker-compose.yml b/cloud/cloud-stream-pulsar/docker-compose.yml index 1ab53238..e185d0c6 100644 --- a/cloud/cloud-stream-pulsar/docker-compose.yml +++ b/cloud/cloud-stream-pulsar/docker-compose.yml @@ -1,6 +1,7 @@ +version: '3' services: pulsar: - image: apachepulsar/pulsar:2.11.0 + image: apachepulsar/pulsar:3.1.0 ports: - '8080' - '6650' diff --git a/cloud/cloud-stream-pulsar/src/main/resources/application.yml b/cloud/cloud-stream-pulsar/src/main/resources/application.yml index bdb76123..db935514 100644 --- a/cloud/cloud-stream-pulsar/src/main/resources/application.yml +++ b/cloud/cloud-stream-pulsar/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring.main.web-application-type: none spring.pulsar: client: service-url: "pulsar://${PULSAR_HOST:localhost}:${PULSAR_PORT_6650:6650}" - administration: + admin: service-url: "http://${PULSAR_HOST:localhost}:${PULSAR_PORT_8080:8080}" spring.cloud: diff --git a/integration/spring-pulsar-reactive/build.gradle b/integration/spring-pulsar-reactive/build.gradle index 14159529..a379418e 100644 --- a/integration/spring-pulsar-reactive/build.gradle +++ b/integration/spring-pulsar-reactive/build.gradle @@ -5,17 +5,22 @@ plugins { id "org.graalvm.buildtools.native" } -ext { - set("springPulsarVersion", "0.2.1-SNAPSHOT") -} - repositories { maven { url "https://repository.apache.org/content/repositories/snapshots" } } dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation("org.springframework.pulsar:spring-pulsar-reactive-spring-boot-starter:${springPulsarVersion}") + + implementation("org.springframework.boot:spring-boot-starter-pulsar-reactive") + constraints { + // TODO remove once Boot goes back to snapshots + implementation("org.springframework.pulsar:spring-pulsar:1.0.0-SNAPSHOT") + implementation("org.springframework.pulsar:spring-pulsar-reactive:1.0.0-SNAPSHOT") + // TODO remove once Boot udpdates BOM to 0.4.0 + implementation("org.apache.pulsar:pulsar-client-reactive-adapter:0.4.0") + implementation("org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded:0.4.0") + } testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/integration/spring-pulsar-reactive/docker-compose.yml b/integration/spring-pulsar-reactive/docker-compose.yml index 1ab53238..e185d0c6 100644 --- a/integration/spring-pulsar-reactive/docker-compose.yml +++ b/integration/spring-pulsar-reactive/docker-compose.yml @@ -1,6 +1,7 @@ +version: '3' services: pulsar: - image: apachepulsar/pulsar:2.11.0 + image: apachepulsar/pulsar:3.1.0 ports: - '8080' - '6650' diff --git a/integration/spring-pulsar-reactive/src/main/resources/application.properties b/integration/spring-pulsar-reactive/src/main/resources/application.properties index c6359061..5a714198 100644 --- a/integration/spring-pulsar-reactive/src/main/resources/application.properties +++ b/integration/spring-pulsar-reactive/src/main/resources/application.properties @@ -1,2 +1,8 @@ spring.pulsar.client.service-url=pulsar://${PULSAR_HOST:localhost}:${PULSAR_PORT_6650:6650} -spring.pulsar.administration.service-url=http://${PULSAR_HOST:localhost}:${PULSAR_PORT_8080:8080} \ No newline at end of file +spring.pulsar.admin.service-url=http://${PULSAR_HOST:localhost}:${PULSAR_PORT_8080:8080} + +logging.level.root=INFO +logging.level.org.apache.pulsar=WARN +logging.level.org.apache.pulsar.common.util.netty.DnsResolverUtil=ERROR +logging.level.org.springframework.pulsar=DEBUG +logging.level.org.springframework.pulsar.function=WARN diff --git a/integration/spring-pulsar/build.gradle b/integration/spring-pulsar/build.gradle index 6803b0b5..1ef3227a 100644 --- a/integration/spring-pulsar/build.gradle +++ b/integration/spring-pulsar/build.gradle @@ -5,13 +5,14 @@ plugins { id "org.graalvm.buildtools.native" } -ext { - set("springPulsarVersion", "0.2.1-SNAPSHOT") -} - dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation("org.springframework.pulsar:spring-pulsar-spring-boot-starter:${springPulsarVersion}") + + implementation("org.springframework.boot:spring-boot-starter-pulsar") + // TODO remove once Boot goes back to snapshots + constraints { + implementation('org.springframework.pulsar:spring-pulsar:1.0.0-SNAPSHOT') + } testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/integration/spring-pulsar/docker-compose.yml b/integration/spring-pulsar/docker-compose.yml index 1ab53238..e185d0c6 100644 --- a/integration/spring-pulsar/docker-compose.yml +++ b/integration/spring-pulsar/docker-compose.yml @@ -1,6 +1,7 @@ +version: '3' services: pulsar: - image: apachepulsar/pulsar:2.11.0 + image: apachepulsar/pulsar:3.1.0 ports: - '8080' - '6650' diff --git a/integration/spring-pulsar/src/main/resources/application.properties b/integration/spring-pulsar/src/main/resources/application.properties index c6359061..eb4a70dc 100644 --- a/integration/spring-pulsar/src/main/resources/application.properties +++ b/integration/spring-pulsar/src/main/resources/application.properties @@ -1,2 +1,2 @@ spring.pulsar.client.service-url=pulsar://${PULSAR_HOST:localhost}:${PULSAR_PORT_6650:6650} -spring.pulsar.administration.service-url=http://${PULSAR_HOST:localhost}:${PULSAR_PORT_8080:8080} \ No newline at end of file +spring.pulsar.admin.service-url=http://${PULSAR_HOST:localhost}:${PULSAR_PORT_8080:8080}