Start version 3.2

build.gradle

@@ -19,9 +19,10 @@ plugins {
 	id 'base'
 	id 'project-report'
 	id 'idea'
-	id 'org.ajoberstar.grgit' version '4.1.1'
+	id 'org.ajoberstar.grgit' version '5.2.1'
 	id 'io.spring.nohttp' version '0.0.11'
 	id 'io.spring.dependency-management' version '1.1.4' apply false
+	id 'com.github.spotbugs' version '6.0.6'
 }
 
 apply plugin: 'io.spring.nohttp'
@@ -52,23 +53,22 @@ ext {
 
 	assertjVersion = '3.24.2'
 	awaitilityVersion = '4.2.0'
-	googleJsr305Version = '3.0.2'
 	hamcrestVersion = '2.2'
 	hibernateValidationVersion = '8.0.1.Final'
 	jacksonBomVersion = '2.15.3'
 	jaywayJsonPathVersion = '2.8.0'
 	junit4Version = '4.13.2'
 	junitJupiterVersion = '5.10.1'
 	kafkaVersion = '3.6.1'
-	log4jVersion = '2.21.1'
+	log4jVersion = '2.22.1'
 	micrometerDocsVersion = '1.0.2'
-	micrometerVersion = '1.12.2'
-	micrometerTracingVersion = '1.2.2'
-	mockitoVersion = '5.6.0'
+	micrometerVersion = '1.13.0-SNAPSHOT'
+	micrometerTracingVersion = '1.3.0-SNAPSHOT'
+	mockitoVersion = '5.8.0'
 	reactorVersion = '2023.0.2'
 	scalaVersion = '2.13'
 	springBootVersion = '3.2.1' // docs module
-	springDataVersion = '2023.1.2'
+	springDataVersion = '2023.2.0-SNAPSHOT'
 	springRetryVersion = '2.0.5'
 	springVersion = '6.1.3'
 	zookeeperVersion = '3.8.3'
@@ -152,7 +152,10 @@ configure(javaProjects) { subproject ->
 
 	// dependencies that are common across all java projects
 	dependencies {
-		implementation "com.google.code.findbugs:jsr305:$googleJsr305Version"
+		def spotbugsAnnotations = "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}"
+		compileOnly spotbugsAnnotations
+		testCompileOnly spotbugsAnnotations
+
 		testImplementation 'org.junit.jupiter:junit-jupiter-api'
 		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 		testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

gradle.properties

@@ -1,4 +1,4 @@
-version=3.1.2-SNAPSHOT
+version=3.2.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,14 +1,6 @@
-pluginManagement {
-	repositories {
-		mavenCentral()
-		gradlePluginPortal()
-		maven { url 'https://repo.spring.io/release' }
-	}
-}
-
 plugins {
-	id 'com.gradle.enterprise' version '3.12.6'
-	id "io.spring.ge.conventions" version "0.0.14"
+	id 'com.gradle.enterprise' version '3.15.1'
+	id 'io.spring.ge.conventions' version '0.0.14'
 }
 
 rootProject.name = 'spring-kafka-dist'

spring-kafka-docs/src/main/antora/antora-playbook.yml

@@ -41,4 +41,4 @@ runtime:
     format: pretty
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.10/ui-bundle.zip

spring-kafka-docs/src/main/antora/modules/ROOT/pages/appendix/change-history.adoc

@@ -1,7 +1,59 @@
 [[history]]
 = Change History
 
-[[migration]]
+[[what-s-new-in-3-1-since-3-0]]
+== What's New in 3.1 Since 3.0
+:page-section-summary-toc: 1
+
+This section covers the changes made from version 3.0 to version 3.1.
+For changes in earlier version, see xref:appendix/change-history.adoc[Change History].
+
+[[x31-kafka-client]]
+=== Kafka Client Version
+
+This version requires the 3.6.0 `kafka-clients`.
+
+[[x31-ekb]]
+=== EmbeddedKafkaBroker
+
+An additional implementation is now provided to use `Kraft` instead of Zookeeper.
+See xref:testing.adoc#ekb[Embedded Kafka Broker] for more information.
+
+[[x31-jd]]
+=== JsonDeserializer
+
+When a deserialization exception occurs, the `SerializationException` message no longer contains the data with the form `Can't deserialize data [[123, 34, 98, 97, 122, ...`; an array of numerical values for each data byte is not useful and can be verbose for large data.
+When used with an `ErrorHandlingDeserializer`, the `DeserializationException` sent to the error handler contains the `data` property which contains the raw data that could not be deserialized.
+When not used with an `ErrorHandlingDeserializer`, the `KafkaConsumer` will continually emit exceptions for the same record showing the topic/partition/offset and the cause thrown by Jackson.
+
+[[x31-cpp]]
+=== ContainerPostProcessor
+
+Post-processing can be applied on a listener container by specifying the bean name of a `ContainerPostProcessor` on the `@KafkaListener` annotation.
+This occurs after the container has been created and after any configured `ContainerCustomizer` configured on the container factory.
+See xref:kafka/container-factory.adoc[Container Factory] for more information.
+
+[[x31-ehd]]
+=== ErrorHandlingDeserializer
+
+You can now add a `Validator` to this deserializer; if the delegate `Deserializer` successfully deserializes the object, but that object fails validation, an exception is thrown similar to a deserialization exception occurring.
+This allows the original raw data to be passed to the error handler.
+See xref:kafka/serdes.adoc#error-handling-deserializer[Using `ErrorHandlingDeserializer`] for more information.
+
+[[x31-retryable]]
+=== Retryable Topics
+Change suffix `-retry-5000` to `-retry` when `@RetryableTopic(backoff = @Backoff(delay = 5000), attempts = "2", fixedDelayTopicStrategy = FixedDelayStrategy.SINGLE_TOPIC)`.
+If you want to keep suffix `-retry-5000`, use `@RetryableTopic(backoff = @Backoff(delay = 5000), attempts = "2")`.
+See xref:retrytopic/topic-naming.adoc[Topic Naming] for more information.
+
+[[x31-c]]
+=== Listener Container Changes
+
+When manually assigning partitions, with a `null` consumer `group.id`, the `AckMode` is now automatically coerced to `MANUAL`.
+See xref:tips.adoc#tip-assign-all-parts[Manually Assigning All Partitions] for more information.
+
+
+[[what-s-new-in-3-0-since-2-9]]
 == What's New in 3.0 Since 2.9
 
 [[x30-kafka-client]]