From 9f2b2844afab7f51d70ace655e33b7afd65a3786 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Wed, 10 May 2023 18:32:31 -0500 Subject: [PATCH] Update Pulsar 3.0.0 (#404) --- spring-pulsar-dependencies/build.gradle | 4 ++-- .../main/asciidoc/attributes-variables.adoc | 2 +- .../download-connectors.sh | 4 ++-- .../sample-signup-function/build.gradle | 4 ++-- .../support/PulsarTestContainerSupport.java | 18 +----------------- tools/pulsar/docker/standalone/pulsar-start.sh | 2 +- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/spring-pulsar-dependencies/build.gradle b/spring-pulsar-dependencies/build.gradle index 8c1ce873..8ec94493 100644 --- a/spring-pulsar-dependencies/build.gradle +++ b/spring-pulsar-dependencies/build.gradle @@ -10,11 +10,11 @@ ext { googleJsr305Version = '3.0.2' protobufJavaVersion = '3.21.5' testcontainersVersion = '1.17.6' - pulsarVersion = '2.11.0' + pulsarVersion = '3.0.0' pulsarClientReactiveVersion = '0.3.0' springBootVersion = '3.0.5' springPulsarStarterVersion = '0.2.1-SNAPSHOT' - springPulsarBinderVersion = '0.2.0' + springPulsarBinderVersion = '0.2.1-SNAPSHOT' springCloudStreamVersion = '4.0.1' } diff --git a/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc b/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc index 3f15dbac..19bbd7ae 100644 --- a/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/attributes-variables.adoc @@ -11,6 +11,6 @@ :spring-cloud-stream-docs: https://docs.spring.io/spring-cloud-stream/docs/{spring-cloud-stream-version}/reference/html/ :spring-cloud-function: https://spring.io/projects/spring-cloud-function -:apache-pulsar-docs: https://pulsar.apache.org/docs/2.11.x +:apache-pulsar-docs: https://pulsar.apache.org/docs/3.0.x :apache-pulsar-io-docs: {apache-pulsar-docs}/io-connectors :apache-pulsar-function-docs: {apache-pulsar-docs}/functions-overview 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 13f27749..67fef444 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-2.11.0/connectors/pulsar-io-cassandra-2.11.0.nar -wget https://archive.apache.org/dist/pulsar/pulsar-2.11.0/connectors/pulsar-io-rabbitmq-2.11.0.nar +wget https://archive.apache.org/dist/pulsar/pulsar-3.0.0/connectors/pulsar-io-cassandra-3.0.0.nar +wget https://archive.apache.org/dist/pulsar/pulsar-3.0.0/connectors/pulsar-io-rabbitmq-3.0.0.nar cd .. diff --git a/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-function/build.gradle b/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-function/build.gradle index 7b2aad20..56152184 100644 --- a/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-function/build.gradle +++ b/spring-pulsar-sample-apps/sample-pulsar-functions/sample-signup-function/build.gradle @@ -11,8 +11,8 @@ repositories { } dependencies { - implementation 'org.apache.pulsar:pulsar-client-all:2.11.0' - implementation 'org.apache.pulsar:pulsar-functions-api:2.11.0' + implementation 'org.apache.pulsar:pulsar-client-all:3.0.0' + implementation 'org.apache.pulsar:pulsar-functions-api:3.0.0' compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' } 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 b2c78726..5d6dec54 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 @@ -16,8 +16,6 @@ package org.springframework.pulsar.test.support; -import java.util.Locale; - import org.junit.jupiter.api.BeforeAll; import org.testcontainers.containers.PulsarContainer; import org.testcontainers.junit.jupiter.Testcontainers; @@ -43,25 +41,11 @@ public interface PulsarTestContainerSupport { } static DockerImageName getPulsarImage() { - return isRunningOnMacM1() ? getMacM1PulsarImage() : getStandardPulsarImage(); + return DockerImageName.parse("apachepulsar/pulsar:3.0.0"); } static String getHttpServiceUrl() { return PULSAR_CONTAINER.getHttpServiceUrl(); } - private static boolean isRunningOnMacM1() { - String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); - String osArchitecture = System.getProperty("os.arch").toLowerCase(Locale.ENGLISH); - return osName.contains("mac") && osArchitecture.equals("aarch64"); - } - - private static DockerImageName getStandardPulsarImage() { - return DockerImageName.parse("apachepulsar/pulsar:2.11.0"); - } - - private static DockerImageName getMacM1PulsarImage() { - return DockerImageName.parse("kezhenxu94/pulsar").asCompatibleSubstituteFor("apachepulsar/pulsar"); - } - } diff --git a/tools/pulsar/docker/standalone/pulsar-start.sh b/tools/pulsar/docker/standalone/pulsar-start.sh index 069f903d..9dc2db28 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:2.11.0 \ + apachepulsar/pulsar:3.0.0 \ bin/pulsar standalone