Initial 5.0 migration

2025-06-11 07:15:31 -04:00
parent 11594bb37a
commit af820ee3c1
29 changed files with 49 additions and 40 deletions
--- a/binders/kafka-binder/pom.xml
+++ b/binders/kafka-binder/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binders</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-stream-binder-kafka</url>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-stream-kafka</artifactId>
 	<description>Spring Cloud Starter Stream Kafka</description>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
 	<description>Spring Cloud Stream Kafka Binder Core</description>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<properties>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- 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();
--- a/binders/pom.xml
+++ b/binders/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-binders</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>binders</name>
 	<description>Framework provided binders</description>
 	<packaging>pom</packaging>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<modules>
--- a/binders/pulsar-binder/pom.xml
+++ b/binders/pulsar-binder/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-binder-pulsar-parent</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binders</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<properties>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-pulsar-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/binders/rabbit-binder/pom.xml
+++ b/binders/rabbit-binder/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
-	<version>4.3.1-SNAPSHOT</version> <!-- Do not remove. Ignore yellow warning -->
+	<version>5.0.0-SNAPSHOT</version> <!-- Do not remove. Ignore yellow warning -->
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binders</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<java.version>17</java.version>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 	<description>Spring Cloud Starter Stream Rabbit</description>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- 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 @@
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
-        <version>4.3.1-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
    </parent>
    <artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
    <description>Rabbit related test classes</description>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -7,11 +7,11 @@
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-release-build</name>
 	<description>Spring Cloud Stream Release Build</description>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

--- a/bom/spring-cloud-starter-parent/pom.xml
+++ b/bom/spring-cloud-starter-parent/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-stream-starter-parent</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>spring-cloud-stream-starter-parent</name>
 	<description>Specifies Boot version for the releaser</description>
 	<packaging>pom</packaging>
--- a/bom/spring-cloud-stream-dependencies/pom.xml
+++ b/bom/spring-cloud-stream-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-stream-dependencies</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-dependencies</name>
 	<description>Spring Cloud Stream Dependencies</description>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-core</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>core</name>
 	<description>Core Spring Cloud Stream</description>
 	<packaging>pom</packaging>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/core/spring-cloud-stream-integration-tests/pom.xml
+++ b/core/spring-cloud-stream-integration-tests/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-core</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
@@ -43,11 +43,19 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-test</artifactId>
+			<version>2.1.10</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib-jdk8</artifactId>
+			<version>2.1.10</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-reflect</artifactId>
+			<version>2.1.10</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -67,6 +75,7 @@
 			<plugin>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<artifactId>kotlin-maven-plugin</artifactId>
+				<version>2.1.10</version>
 				<executions>
 					<execution>
 						<id>compile</id>
--- a/core/spring-cloud-stream-test-binder/pom.xml
+++ b/core/spring-cloud-stream-test-binder/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-core</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/core/spring-cloud-stream-test-support/pom.xml
+++ b/core/spring-cloud-stream-test-support/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-core</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/core/spring-cloud-stream/pom.xml
+++ b/core/spring-cloud-stream/pom.xml
@@ -12,7 +12,7 @@
    <parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-core</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Stream Docs</name>
--- 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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-parent</artifactId>
-	<version>4.3.1-SNAPSHOT</version> <!-- Do not remove. Ignore yellow warning -->
+	<version>5.0.0-SNAPSHOT</version> <!-- Do not remove. Ignore yellow warning -->
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -24,7 +24,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<objenesis.version>2.1</objenesis.version>
-		<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
--- a/schema-registry/pom.xml
+++ b/schema-registry/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-schema-registry</artifactId>
-	<version>4.3.1-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>schema-registry</name>
 	<description>Spring Cloud Stream Schema Registry Components</description>
 	<packaging>pom</packaging>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

 	<properties>
--- 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 @@
 	<parent>
 		<artifactId>spring-cloud-stream-schema-registry</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

--- 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 @@
    <parent>
        <artifactId>spring-cloud-stream-schema-registry</artifactId>
        <groupId>org.springframework.cloud</groupId>
-        <version>4.3.1-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
    </parent>

    <dependencies>
--- 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 @@
 	<parent>
 		<artifactId>spring-cloud-stream-schema-registry</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.3.1-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 	</parent>

    <properties>