From 464ce685bb90f2d7cfb7ec48c31064b4d821ea59 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 8 Nov 2019 16:29:19 +0000 Subject: [PATCH] Update SNAPSHOT to 3.0.0.RC2 --- README.adoc | 22 ++++++++++++++----- docs/pom.xml | 2 +- pom.xml | 8 +++---- spring-cloud-starter-stream-kafka/pom.xml | 2 +- spring-cloud-stream-binder-kafka-core/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-stream-binder-kafka/pom.xml | 2 +- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index 45d973c74..ef47c3a2a 100644 --- a/README.adoc +++ b/README.adoc @@ -39,7 +39,7 @@ To use Apache Kafka binder, you need to add `spring-cloud-stream-binder-kafka` a ---- -Alternatively, you can also use the Spring Cloud Stream Kafka Starter, as shown inn the following example for Maven: +Alternatively, you can also use the Spring Cloud Stream Kafka Starter, as shown in the following example for Maven: [source,xml] ---- @@ -60,7 +60,7 @@ The Apache Kafka Binder implementation maps each destination to an Apache Kafka The consumer group maps directly to the same Apache Kafka concept. Partitioning also maps directly to Apache Kafka partitions as well. -The binder currently uses the Apache Kafka `kafka-clients` 1.0.0 jar and is designed to be used with a broker of at least that version. +The binder currently uses the Apache Kafka `kafka-clients` version `2.3.1`. This client can communicate with older brokers (see the Kafka documentation), but certain features may not be available. For example, with versions earlier than 0.11.x.x, native headers are not supported. Also, 0.11.x.x does not support the `autoAddPartitions` property. @@ -155,14 +155,15 @@ Default: See individual producer properties. spring.cloud.stream.kafka.binder.headerMapperBeanName:: The bean name of a `KafkaHeaderMapper` used for mapping `spring-messaging` headers to and from Kafka headers. -Use this, for example, if you wish to customize the trusted packages in a `DefaultKafkaHeaderMapper` that uses JSON deserialization for the headers. +Use this, for example, if you wish to customize the trusted packages in a `BinderHeaderMapper` bean that uses JSON deserialization for the headers. +If this custom `BinderHeaderMapper` bean is not made available to the binder using this property, then the binder will look for a header mapper bean with the name `kafkaBinderHeaderMapper` that is of type `BinderHeaderMapper` before falling back to a default `BinderHeaderMapper` created by the binder. + 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.=`. +NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.kafka.default.consumer.=`. The following properties are available for Kafka consumers only and @@ -227,9 +228,20 @@ The DLQ topic name can be configurable by setting the `dlqName` property. This provides an alternative option to the more common Kafka replay scenario for the case when the number of errors is relatively small and replaying the entire original topic may be too cumbersome. See <> processing for more information. Starting with version 2.0, messages sent to the DLQ topic are enhanced with the following headers: `x-original-topic`, `x-exception-message`, and `x-exception-stacktrace` as `byte[]`. +By default, a failed record is sent to the same partition number in the DLQ topic as the original record. +See <> for how to change that behavior. **Not allowed when `destinationIsPattern` is `true`.** + Default: `false`. +dlqPartitions:: +When `enableDlq` is true, and this property is not set, a dead letter topic with the same number of partitions as the primary topic(s) is created. +Usually, dead-letter records are sent to the same partition in the dead-letter topic as the original record. +This behavior can be changed; see <>. +If this property is set to `1` and there is no `DqlPartitionFunction` bean, all dead-letter records will be written to partition `0`. +If this property is greater than `1`, you **MUST** provide a `DlqPartitionFunction` bean. +Note that the actual partition count is affected by the binder's `minPartitionCount` property. ++ +Default: `none` configuration:: Map with a key/value pair containing generic Kafka consumer properties. In addition to having Kafka consumer properties, other configuration properties can be passed here. @@ -304,7 +316,7 @@ Refer to the https://docs.spring.io/spring-kafka/docs/2.3.0.BUILD-SNAPSHOT/refer [[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.=`. +NOTE: To avoid repetition, Spring Cloud Stream supports setting values for all channels, in the format of `spring.cloud.stream.kafka.default.producer.=`. The following properties are available for Kafka producers only and diff --git a/docs/pom.xml b/docs/pom.xml index 1354f8d84..4940a0373 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.RC2 pom spring-cloud-stream-binder-kafka-docs diff --git a/pom.xml b/pom.xml index 66942d5ad..fcc73e328 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.RC2 pom org.springframework.cloud spring-cloud-build - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RC2 @@ -15,8 +15,8 @@ 2.3.2.RELEASE 3.2.1.RELEASE 2.3.1 - 1.0.0.BUILD-SNAPSHOT - 3.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 + 3.0.0.RC2 true true true diff --git a/spring-cloud-starter-stream-kafka/pom.xml b/spring-cloud-starter-stream-kafka/pom.xml index 79068095d..59b27573d 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.RC2 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..36e2d3e4c 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.RC2 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 d474fd99c..9e04f1963 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.RC2 diff --git a/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binder-kafka/pom.xml index 0eb1f645e..ccee1ca77 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.RC2