From 35434c680bbb7d384e1d8fd7eb0b9bb630e909ad Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 3 Jul 2019 14:56:00 +0000 Subject: [PATCH] Update SNAPSHOT to 3.0.0.M2 --- README.adoc | 14 ++++++++++++-- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-starter-stream-kafka/pom.xml | 2 +- spring-cloud-stream-binder-kafka-core/pom.xml | 2 +- spring-cloud-stream-binder-kafka-streams/pom.xml | 2 +- spring-cloud-stream-binder-kafka/pom.xml | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/README.adoc b/README.adoc index fe27642c9..a227f2e0a 100644 --- a/README.adoc +++ b/README.adoc @@ -162,6 +162,9 @@ Default: none. [[kafka-consumer-properties]] ==== Kafka Consumer Properties +NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.default.=`. + + The following properties are available for Kafka consumers only and must be prefixed with `spring.cloud.stream.kafka.bindings..consumer.`. @@ -284,6 +287,9 @@ Default: none (the binder-wide default of 1 is used). [[kafka-producer-properties]] ==== Kafka Producer Properties +NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.default.=`. + + The following properties are available for Kafka producers only and must be prefixed with `spring.cloud.stream.kafka.bindings..producer.`. @@ -341,7 +347,11 @@ The replication factor to use when provisioning topics. Overrides the binder-wid Ignored if `replicas-assignments` is present. + Default: none (the binder-wide default of 1 is used). - +useTopicHeader:: +Set to `true` to override the default binding destination (topic name) with the value of the `KafkaHeaders.TOPIC` message header in the outbound message. +If the header is not present, the default binding destination is used. +Default: `false`. ++ NOTE: The Kafka binder uses the `partitionCount` setting of the producer as a hint to create a topic with the given partition count (in conjunction with the `minPartitionCount`, the maximum of the two being the value being used). Exercise caution when configuring both `minPartitionCount` for a binder and `partitionCount` for an application, as the larger value is used. @@ -731,4 +741,4 @@ added after the original pull request but before a merge. if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). -// ====================================================================================== +// ====================================================================================== \ No newline at end of file diff --git a/docs/pom.xml b/docs/pom.xml index 5ace9406d..a2902a31e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2 pom spring-cloud-stream-binder-kafka-docs diff --git a/pom.xml b/pom.xml index a315e78f7..a41d3123f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,12 @@ 4.0.0 spring-cloud-stream-binder-kafka-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2 pom org.springframework.cloud spring-cloud-build - 2.2.0.BUILD-SNAPSHOT + 2.2.0.M3 @@ -15,7 +15,7 @@ 2.2.5.RELEASE 3.2.0.M3 2.0.0 - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2 true true true diff --git a/spring-cloud-starter-stream-kafka/pom.xml b/spring-cloud-starter-stream-kafka/pom.xml index 79068095d..8caff08d1 100644 --- a/spring-cloud-starter-stream-kafka/pom.xml +++ b/spring-cloud-starter-stream-kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2 spring-cloud-starter-stream-kafka Spring Cloud Starter Stream Kafka diff --git a/spring-cloud-stream-binder-kafka-core/pom.xml b/spring-cloud-stream-binder-kafka-core/pom.xml index 469550acc..6c5c580ab 100644 --- a/spring-cloud-stream-binder-kafka-core/pom.xml +++ b/spring-cloud-stream-binder-kafka-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2 spring-cloud-stream-binder-kafka-core Spring Cloud Stream Kafka Binder Core diff --git a/spring-cloud-stream-binder-kafka-streams/pom.xml b/spring-cloud-stream-binder-kafka-streams/pom.xml index d3ad4d3cc..3ff334ae0 100644 --- a/spring-cloud-stream-binder-kafka-streams/pom.xml +++ b/spring-cloud-stream-binder-kafka-streams/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2 diff --git a/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binder-kafka/pom.xml index 149353118..0d309a4f6 100644 --- a/spring-cloud-stream-binder-kafka/pom.xml +++ b/spring-cloud-stream-binder-kafka/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-stream-binder-kafka-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M2