SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into 4.2.x

Browse Source
This commit is contained in:
Oleg Zhurakousky
2025-02-10 14:22:06 +01:00
parent 0f68d94c5b 7178dbfdac
commit 321d7afdcd
30 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
binders/kafka-binder/pom.xml
View File

@@ -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.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binders</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<scm>
<url>https://github.com/spring-cloud/spring-cloud-stream-binder-kafka</url>

2
binders/kafka-binder/spring-cloud-starter-stream-kafka/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-starter-stream-kafka</artifactId>
<description>Spring Cloud Starter Stream Kafka</description>

2
binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
<description>Spring Cloud Stream Kafka Binder Core</description>

2
binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<properties>

2
binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-kafka-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

4
binders/pom.xml
View File

@@ -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.2.1-SNAPSHOT</version>
<version>4.3.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.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modules>

4
binders/pulsar-binder/pom.xml
View File

@@ -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.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binders</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<properties>

2
binders/pulsar-binder/spring-cloud-stream-binder-pulsar/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-pulsar-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

6
binders/rabbit-binder/pom.xml
View File

@@ -2,16 +2,16 @@
<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.2.1-SNAPSHOT</version> <!-- Do not remove. Ignore yellow warning -->
<version>4.3.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.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<properties>
<java.version>17</java.version>
<spring-cloud-function.version>4.2.1-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-function.version>4.3.0-SNAPSHOT</spring-cloud-function.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failsOnViolation>true
</maven-checkstyle-plugin.failsOnViolation>

2
binders/rabbit-binder/spring-cloud-starter-stream-rabbit/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
<description>Spring Cloud Starter Stream Rabbit</description>

2
binders/rabbit-binder/spring-cloud-stream-binder-rabbit-core/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
binders/rabbit-binder/spring-cloud-stream-binder-rabbit-test-support/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
<description>Rabbit related test classes</description>

2
binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-rabbit-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

4
bom/pom.xml
View File

@@ -7,11 +7,11 @@
<packaging>pom</packaging>
<name>spring-cloud-stream-release-build</name>
<description>Spring Cloud Stream Release Build</description>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath/>
</parent>

4
bom/spring-cloud-starter-parent/pom.xml
View File

@@ -6,12 +6,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.0</version>
<version>3.5.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-starter-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<name>spring-cloud-stream-starter-parent</name>
<description>Specifies Boot version for the releaser</description>
<packaging>pom</packaging>

4
bom/spring-cloud-stream-dependencies/pom.xml
View File

@@ -6,11 +6,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-stream-dependencies</name>
<description>Spring Cloud Stream Dependencies</description>

4
core/pom.xml
View File

@@ -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.2.1-SNAPSHOT</version>
<version>4.3.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.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
core/spring-cloud-stream-integration-tests/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-core</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
core/spring-cloud-stream-test-binder/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-core</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
core/spring-cloud-stream-test-support/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-core</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
core/spring-cloud-stream/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-core</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
docs/modules/ROOT/pages/spring-cloud-stream/bindings.adoc
View File

@@ -25,7 +25,7 @@ public class SampleApplication {
}
}
----
The above example looks no different then any vanilla spring-boot application. It defines a single bean of type `Function`
The above example looks no different than any vanilla spring-boot application. It defines a single bean of type `Function`
and that is it. So, how does it become a spring-cloud-stream application?
It becomes a spring-cloud-stream application simply because of the presence of spring-cloud-stream and binder dependencies
and auto-configuration classes on the classpath, effectively setting the context for your boot application as a spring-cloud-stream application.

2
docs/modules/ROOT/pages/spring-cloud-stream/producing-and-consuming-messages.adoc
View File

@@ -13,7 +13,7 @@ we recommend using functional implementations.
[[overview]]
=== Overview
Since Spring Cloud Stream v2.1, another alternative for defining _stream handlers_ and _sources_ is to use build-in
Since Spring Cloud Stream v2.1, another alternative for defining _stream handlers_ and _sources_ is to use built-in
support for https://cloud.spring.io/spring-cloud-function/[Spring Cloud Function] where they can be expressed as beans of
type `java.util.function.[Supplier/Function/Consumer]`.

2
docs/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-parent</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Spring Cloud Stream Docs</name>

6
pom.xml
View File

@@ -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.2.1-SNAPSHOT</version> <!-- Do not remove. Ignore yellow warning -->
<version>4.3.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.2.1-SNAPSHOT</version>
<version>4.3.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.2.1-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-function.version>4.3.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>

4
schema-registry/pom.xml
View File

@@ -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.2.1-SNAPSHOT</version>
<version>4.3.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.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<properties>

2
schema-registry/spring-cloud-stream-schema-registry-client/pom.xml
View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>spring-cloud-stream-schema-registry</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
schema-registry/spring-cloud-stream-schema-registry-core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>spring-cloud-stream-schema-registry</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>

2
schema-registry/spring-cloud-stream-schema-registry-server/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<artifactId>spring-cloud-stream-schema-registry</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>4.2.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<properties>