From 68ac11c1fc1627547f36e6f80189cda7189edac6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 11 Mar 2024 20:36:36 +0000 Subject: [PATCH] Start building against Spring Pulsar 1.1.0 snapshots See gh-39898 --- .../autoconfigure/pulsar/PulsarAutoConfigurationTests.java | 7 +++++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationTests.java index 91e07c804d..7e0fb8b2b2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationTests.java @@ -28,6 +28,7 @@ import org.apache.pulsar.client.api.ReaderBuilder; import org.apache.pulsar.client.api.interceptor.ProducerInterceptor; import org.apache.pulsar.common.schema.SchemaType; import org.assertj.core.api.InstanceOfAssertFactories; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; @@ -284,20 +285,22 @@ class PulsarAutoConfigurationTests { } @Test + @Disabled("Changes in https://github.com/spring-projects/spring-pulsar/issues/593 prevent introspection of the interceptors") void whenHasUseDefinedProducerInterceptorInjectsBean() { ProducerInterceptor interceptor = mock(ProducerInterceptor.class); this.contextRunner.withBean("customProducerInterceptor", ProducerInterceptor.class, () -> interceptor) .run((context) -> assertThat(context).getBean(PulsarTemplate.class) - .extracting("interceptors") + .extracting("interceptorsCustomizers") .asInstanceOf(InstanceOfAssertFactories.LIST) .contains(interceptor)); } @Test + @Disabled("Changes in https://github.com/spring-projects/spring-pulsar/issues/593 prevent introspection of the interceptors") void whenHasUseDefinedProducerInterceptorsInjectsBeansInCorrectOrder() { this.contextRunner.withUserConfiguration(InterceptorTestConfiguration.class) .run((context) -> assertThat(context).getBean(PulsarTemplate.class) - .extracting("interceptors") + .extracting("interceptorsCustomizers") .asInstanceOf(InstanceOfAssertFactories.LIST) .containsExactly(context.getBean("interceptorBar"), context.getBean("interceptorFoo"))); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2bd46f2df0..63afb3167e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1926,7 +1926,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-ldap/releases/tag/{version}") } } - library("Spring Pulsar", "1.1.0-M1") { + library("Spring Pulsar", "1.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.pulsar") { imports = [