diff --git a/spring-pulsar-dependencies/build.gradle b/spring-pulsar-dependencies/build.gradle index ed00b6f6..509b9cec 100644 --- a/spring-pulsar-dependencies/build.gradle +++ b/spring-pulsar-dependencies/build.gradle @@ -10,7 +10,7 @@ ext { googleJsr305Version = '3.0.2' protobufJavaVersion = '3.21.5' testcontainersVersion = '1.17.6' - pulsarVersion = '2.10.3' + pulsarVersion = '2.11.0' pulsarClientReactiveVersion = '0.2.0' springBootVersion = '3.0.2' springCloudStreamVersion = '4.0.1' diff --git a/spring-pulsar-docs/src/main/asciidoc/attributes.adoc b/spring-pulsar-docs/src/main/asciidoc/attributes.adoc index 338d9443..e1f6cbb3 100644 --- a/spring-pulsar-docs/src/main/asciidoc/attributes.adoc +++ b/spring-pulsar-docs/src/main/asciidoc/attributes.adoc @@ -13,6 +13,6 @@ :javadocs: https://docs.spring.io/spring-pulsar/docs/{spring-pulsar-version}/api :spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle -:apache-pulsar-docs: https://pulsar.apache.org/docs/2.10.x +:apache-pulsar-docs: https://pulsar.apache.org/docs/2.11.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 70d22ba7..13f27749 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.10.3/connectors/pulsar-io-cassandra-2.10.3.nar -wget https://archive.apache.org/dist/pulsar/pulsar-2.10.3/connectors/pulsar-io-rabbitmq-2.10.3.nar +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 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 8a61f769..7b2aad20 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.10.3' - implementation 'org.apache.pulsar:pulsar-functions-api:2.10.3' + implementation 'org.apache.pulsar:pulsar-client-all:2.11.0' + implementation 'org.apache.pulsar:pulsar-functions-api:2.11.0' compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' } diff --git a/spring-pulsar-spring-boot-autoconfigure/build.gradle b/spring-pulsar-spring-boot-autoconfigure/build.gradle index 28554825..0631b7f7 100644 --- a/spring-pulsar-spring-boot-autoconfigure/build.gradle +++ b/spring-pulsar-spring-boot-autoconfigure/build.gradle @@ -41,8 +41,8 @@ task downloadRabbitConnector { try { download.run { println "Downloading Rabbit connector to 'src/test/resources/connectors/' (one time only if not already downloaded)..." - src 'https://archive.apache.org/dist/pulsar/pulsar-2.10.3/connectors/pulsar-io-rabbitmq-2.10.3.nar' - dest "$buildDir/../src/test/resources/connectors/pulsar-io-rabbitmq-2.10.3.nar" + src 'https://archive.apache.org/dist/pulsar/pulsar-2.11.0/connectors/pulsar-io-rabbitmq-2.11.0.nar' + dest "$buildDir/../src/test/resources/connectors/pulsar-io-rabbitmq-2.11.0.nar" overwrite false } } catch (Exception ex) { 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 9dab52d0..b2c78726 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 @@ -57,7 +57,7 @@ public interface PulsarTestContainerSupport { } private static DockerImageName getStandardPulsarImage() { - return DockerImageName.parse("apachepulsar/pulsar:2.10.3"); + return DockerImageName.parse("apachepulsar/pulsar:2.11.0"); } private static DockerImageName getMacM1PulsarImage() { diff --git a/spring-pulsar/build.gradle b/spring-pulsar/build.gradle index c8b61d8c..c9dd99a6 100644 --- a/spring-pulsar/build.gradle +++ b/spring-pulsar/build.gradle @@ -8,7 +8,9 @@ dependencies { api 'com.github.ben-manes.caffeine:caffeine' api 'com.google.protobuf:protobuf-java' api 'io.micrometer:micrometer-observation' - api 'org.apache.pulsar:pulsar-client-all' + api ('org.apache.pulsar:pulsar-client-all') { + exclude group: 'org.apache.logging.log4j' + } api 'org.springframework:spring-context' api 'org.springframework:spring-messaging' api 'org.springframework:spring-tx' diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/function/package-info.java b/spring-pulsar/src/main/java/org/springframework/pulsar/function/package-info.java index 68f7a452..e8ce84d1 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/function/package-info.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/function/package-info.java @@ -1,8 +1,7 @@ /** * Package containing support for - * Pulsar - * Functions and Pulsar - * IO Connectors. + * Pulsar Functions and + * Pulsar IO Connectors. */ @NonNullApi @NonNullFields diff --git a/tools/pulsar/docker/standalone/pulsar-start.sh b/tools/pulsar/docker/standalone/pulsar-start.sh index 5797b620..069f903d 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.10.3 \ + apachepulsar/pulsar:2.11.0 \ bin/pulsar standalone