From af820ee3c105eca6c7151ffbbf48fa4055976fbc Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 11 Jun 2025 07:15:31 -0400 Subject: [PATCH] Initial 5.0 migration --- binders/kafka-binder/pom.xml | 4 ++-- .../spring-cloud-starter-stream-kafka/pom.xml | 2 +- .../spring-cloud-stream-binder-kafka-core/pom.xml | 2 +- .../spring-cloud-stream-binder-kafka-reactive/pom.xml | 2 +- .../spring-cloud-stream-binder-kafka-streams/pom.xml | 2 +- .../spring-cloud-stream-binder-kafka/pom.xml | 2 +- .../stream/binder/kafka/KafkaTransactionTests.java | 4 ++-- binders/pom.xml | 4 ++-- binders/pulsar-binder/pom.xml | 4 ++-- .../spring-cloud-stream-binder-pulsar/pom.xml | 2 +- binders/rabbit-binder/pom.xml | 4 ++-- .../spring-cloud-starter-stream-rabbit/pom.xml | 2 +- .../spring-cloud-stream-binder-rabbit-core/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-stream-binder-rabbit/pom.xml | 2 +- bom/pom.xml | 4 ++-- bom/spring-cloud-starter-parent/pom.xml | 2 +- bom/spring-cloud-stream-dependencies/pom.xml | 4 ++-- core/pom.xml | 4 ++-- core/spring-cloud-stream-integration-tests/pom.xml | 11 ++++++++++- core/spring-cloud-stream-test-binder/pom.xml | 2 +- core/spring-cloud-stream-test-support/pom.xml | 2 +- core/spring-cloud-stream/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +++--- schema-registry/pom.xml | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-stream-schema-registry-core/pom.xml | 2 +- .../pom.xml | 2 +- 29 files changed, 49 insertions(+), 40 deletions(-) diff --git a/binders/kafka-binder/pom.xml b/binders/kafka-binder/pom.xml index b57e0593f..96cf1a1b4 100644 --- a/binders/kafka-binder/pom.xml +++ b/binders/kafka-binder/pom.xml @@ -2,12 +2,12 @@ 4.0.0 spring-cloud-stream-binder-kafka-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT https://github.com/spring-cloud/spring-cloud-stream-binder-kafka diff --git a/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml b/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml index 6a17633d0..94da64398 100644 --- a/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml +++ b/binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT spring-cloud-starter-stream-kafka Spring Cloud Starter Stream Kafka diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml index 42ff4f1e3..f5e2d9a09 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT spring-cloud-stream-binder-kafka-core Spring Cloud Stream Kafka Binder Core diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml index 2f8856edb..10470d574 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml index 2cee340ad..e759eedc7 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml index ca1f9b001..e6c14ee39 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTransactionTests.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTransactionTests.java index 1c018396f..82a96dd72 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTransactionTests.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaTransactionTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.stream.binder.kafka; import java.util.Collections; +import java.util.concurrent.CompletableFuture; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.Producer; @@ -42,7 +43,6 @@ import org.springframework.kafka.test.condition.EmbeddedKafkaCondition; import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.messaging.support.GenericMessage; import org.springframework.retry.support.RetryTemplate; -import org.springframework.util.concurrent.SettableListenableFuture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -84,7 +84,7 @@ class KafkaTransactionTests { }); provisioningProvider.setMetadataRetryOperations(new RetryTemplate()); final Producer mockProducer = mock(Producer.class); - given(mockProducer.send(any(), any())).willReturn(new SettableListenableFuture<>()); + given(mockProducer.send(any(), any())).willReturn(new CompletableFuture<>()); KafkaProducerProperties extension1 = configurationProperties .getTransaction().getProducer().getExtension(); diff --git a/binders/pom.xml b/binders/pom.xml index dd2b1449e..5ec20143e 100644 --- a/binders/pom.xml +++ b/binders/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-binders - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT binders Framework provided binders pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/pulsar-binder/pom.xml b/binders/pulsar-binder/pom.xml index dacd1694a..271fe9c76 100644 --- a/binders/pulsar-binder/pom.xml +++ b/binders/pulsar-binder/pom.xml @@ -2,12 +2,12 @@ 4.0.0 spring-cloud-stream-binder-pulsar-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml b/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml index bd03afadc..e4a62b448 100644 --- a/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml +++ b/binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-pulsar-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/rabbit-binder/pom.xml b/binders/rabbit-binder/pom.xml index 0233e0c34..96af201e1 100644 --- a/binders/rabbit-binder/pom.xml +++ b/binders/rabbit-binder/pom.xml @@ -2,12 +2,12 @@ 4.0.0 spring-cloud-stream-binder-rabbit-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT pom org.springframework.cloud spring-cloud-stream-binders - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT 17 diff --git a/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml b/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml index 26f8ecb3f..7d622b0bd 100644 --- a/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml +++ b/binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT spring-cloud-starter-stream-rabbit Spring Cloud Starter Stream Rabbit diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml index 7983d2633..2386ad4b5 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml index 560302991..c17566c05 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT spring-cloud-stream-binder-rabbit-test-support Rabbit related test classes diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml index a3705833a..576f37f68 100644 --- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml +++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-rabbit-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/bom/pom.xml b/bom/pom.xml index 781f4e16f..fbea1394d 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,11 +7,11 @@ pom spring-cloud-stream-release-build Spring Cloud Stream Release Build - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/bom/spring-cloud-starter-parent/pom.xml b/bom/spring-cloud-starter-parent/pom.xml index 512e57a86..98942d5df 100644 --- a/bom/spring-cloud-starter-parent/pom.xml +++ b/bom/spring-cloud-starter-parent/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-stream-starter-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT spring-cloud-stream-starter-parent Specifies Boot version for the releaser pom diff --git a/bom/spring-cloud-stream-dependencies/pom.xml b/bom/spring-cloud-stream-dependencies/pom.xml index 0de8fc8e6..1096bb1c9 100644 --- a/bom/spring-cloud-stream-dependencies/pom.xml +++ b/bom/spring-cloud-stream-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT spring-cloud-stream-dependencies - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT pom spring-cloud-stream-dependencies Spring Cloud Stream Dependencies diff --git a/core/pom.xml b/core/pom.xml index 76de078da..7f2a9d9a7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-core - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT core Core Spring Cloud Stream pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT .. diff --git a/core/spring-cloud-stream-integration-tests/pom.xml b/core/spring-cloud-stream-integration-tests/pom.xml index bb39f5ab5..414baba3c 100644 --- a/core/spring-cloud-stream-integration-tests/pom.xml +++ b/core/spring-cloud-stream-integration-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-stream-core - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT @@ -43,11 +43,19 @@ org.jetbrains.kotlin kotlin-test + 2.1.10 test org.jetbrains.kotlin kotlin-stdlib-jdk8 + 2.1.10 + true + + + org.jetbrains.kotlin + kotlin-reflect + 2.1.10 true @@ -67,6 +75,7 @@ org.jetbrains.kotlin kotlin-maven-plugin + 2.1.10 compile diff --git a/core/spring-cloud-stream-test-binder/pom.xml b/core/spring-cloud-stream-test-binder/pom.xml index 953149c4c..0f9f79bc4 100644 --- a/core/spring-cloud-stream-test-binder/pom.xml +++ b/core/spring-cloud-stream-test-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-stream-core - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/core/spring-cloud-stream-test-support/pom.xml b/core/spring-cloud-stream-test-support/pom.xml index 3c278340f..9e7b4d60e 100644 --- a/core/spring-cloud-stream-test-support/pom.xml +++ b/core/spring-cloud-stream-test-support/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-stream-core - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/core/spring-cloud-stream/pom.xml b/core/spring-cloud-stream/pom.xml index 2f5caef99..4b02bfd78 100644 --- a/core/spring-cloud-stream/pom.xml +++ b/core/spring-cloud-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-stream-core - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index ebdceba62..eedf5551e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT jar Spring Cloud Stream Docs diff --git a/pom.xml b/pom.xml index c487d83bb..450009e58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-stream-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT @@ -24,7 +24,7 @@ 17 2.1 - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT true true true diff --git a/schema-registry/pom.xml b/schema-registry/pom.xml index 470f027c0..f1758f113 100644 --- a/schema-registry/pom.xml +++ b/schema-registry/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-stream-schema-registry - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT schema-registry Spring Cloud Stream Schema Registry Components pom @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-parent - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml b/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml index 8bf4fa436..240831eee 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml +++ b/schema-registry/spring-cloud-stream-schema-registry-client/pom.xml @@ -3,7 +3,7 @@ spring-cloud-stream-schema-registry org.springframework.cloud - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT 4.0.0 diff --git a/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml b/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml index 75904c6a0..775f282c1 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml +++ b/schema-registry/spring-cloud-stream-schema-registry-core/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-schema-registry org.springframework.cloud - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT diff --git a/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml b/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml index 22dc25856..7c90cf940 100644 --- a/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml +++ b/schema-registry/spring-cloud-stream-schema-registry-server/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-schema-registry org.springframework.cloud - 4.3.1-SNAPSHOT + 5.0.0-SNAPSHOT