Skip to content

Commit 9532e42

Browse files
committed
Start version 3.2
1 parent f9476a3 commit 9532e42

File tree

9 files changed

+73
-309
lines changed

9 files changed

+73
-309
lines changed

build.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ plugins {
1919
id 'base'
2020
id 'project-report'
2121
id 'idea'
22-
id 'org.ajoberstar.grgit' version '4.1.1'
22+
id 'org.ajoberstar.grgit' version '5.2.1'
2323
id 'io.spring.nohttp' version '0.0.11'
2424
id 'io.spring.dependency-management' version '1.1.4' apply false
25+
id 'com.github.spotbugs' version '6.0.6'
2526
}
2627

2728
apply plugin: 'io.spring.nohttp'
@@ -52,23 +53,22 @@ ext {
5253

5354
assertjVersion = '3.24.2'
5455
awaitilityVersion = '4.2.0'
55-
googleJsr305Version = '3.0.2'
5656
hamcrestVersion = '2.2'
5757
hibernateValidationVersion = '8.0.1.Final'
5858
jacksonBomVersion = '2.15.3'
5959
jaywayJsonPathVersion = '2.8.0'
6060
junit4Version = '4.13.2'
6161
junitJupiterVersion = '5.10.1'
6262
kafkaVersion = '3.6.1'
63-
log4jVersion = '2.21.1'
63+
log4jVersion = '2.22.1'
6464
micrometerDocsVersion = '1.0.2'
65-
micrometerVersion = '1.12.2'
66-
micrometerTracingVersion = '1.2.2'
67-
mockitoVersion = '5.6.0'
65+
micrometerVersion = '1.13.0-SNAPSHOT'
66+
micrometerTracingVersion = '1.3.0-SNAPSHOT'
67+
mockitoVersion = '5.8.0'
6868
reactorVersion = '2023.0.2'
6969
scalaVersion = '2.13'
7070
springBootVersion = '3.2.1' // docs module
71-
springDataVersion = '2023.1.2'
71+
springDataVersion = '2023.2.0-SNAPSHOT'
7272
springRetryVersion = '2.0.5'
7373
springVersion = '6.1.3'
7474
zookeeperVersion = '3.8.3'
@@ -152,7 +152,10 @@ configure(javaProjects) { subproject ->
152152

153153
// dependencies that are common across all java projects
154154
dependencies {
155-
implementation "com.google.code.findbugs:jsr305:$googleJsr305Version"
155+
def spotbugsAnnotations = "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}"
156+
compileOnly spotbugsAnnotations
157+
testCompileOnly spotbugsAnnotations
158+
156159
testImplementation 'org.junit.jupiter:junit-jupiter-api'
157160
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
158161
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

examples.desktop

Lines changed: 0 additions & 240 deletions
This file was deleted.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.1.2-SNAPSHOT
1+
version=3.2.0-SNAPSHOT
22
org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
33
org.gradle.caching=true
44
org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
pluginManagement {
2-
repositories {
3-
mavenCentral()
4-
gradlePluginPortal()
5-
maven { url 'https://repo.spring.io/release' }
6-
}
7-
}
8-
91
plugins {
10-
id 'com.gradle.enterprise' version '3.12.6'
11-
id "io.spring.ge.conventions" version "0.0.14"
2+
id 'com.gradle.enterprise' version '3.15.1'
3+
id 'io.spring.ge.conventions' version '0.0.14'
124
}
135

146
rootProject.name = 'spring-kafka-dist'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ runtime:
4141
format: pretty
4242
ui:
4343
bundle:
44-
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
44+
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

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,59 @@
11
[[history]]
22
= Change History
33

4-
[[migration]]
4+
[[what-s-new-in-3-1-since-3-0]]
5+
== What's New in 3.1 Since 3.0
6+
:page-section-summary-toc: 1
7+
8+
This section covers the changes made from version 3.0 to version 3.1.
9+
For changes in earlier version, see xref:appendix/change-history.adoc[Change History].
10+
11+
[[x31-kafka-client]]
12+
=== Kafka Client Version
13+
14+
This version requires the 3.6.0 `kafka-clients`.
15+
16+
[[x31-ekb]]
17+
=== EmbeddedKafkaBroker
18+
19+
An additional implementation is now provided to use `Kraft` instead of Zookeeper.
20+
See xref:testing.adoc#ekb[Embedded Kafka Broker] for more information.
21+
22+
[[x31-jd]]
23+
=== JsonDeserializer
24+
25+
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.
26+
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.
27+
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.
28+
29+
[[x31-cpp]]
30+
=== ContainerPostProcessor
31+
32+
Post-processing can be applied on a listener container by specifying the bean name of a `ContainerPostProcessor` on the `@KafkaListener` annotation.
33+
This occurs after the container has been created and after any configured `ContainerCustomizer` configured on the container factory.
34+
See xref:kafka/container-factory.adoc[Container Factory] for more information.
35+
36+
[[x31-ehd]]
37+
=== ErrorHandlingDeserializer
38+
39+
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.
40+
This allows the original raw data to be passed to the error handler.
41+
See xref:kafka/serdes.adoc#error-handling-deserializer[Using `ErrorHandlingDeserializer`] for more information.
42+
43+
[[x31-retryable]]
44+
=== Retryable Topics
45+
Change suffix `-retry-5000` to `-retry` when `@RetryableTopic(backoff = @Backoff(delay = 5000), attempts = "2", fixedDelayTopicStrategy = FixedDelayStrategy.SINGLE_TOPIC)`.
46+
If you want to keep suffix `-retry-5000`, use `@RetryableTopic(backoff = @Backoff(delay = 5000), attempts = "2")`.
47+
See xref:retrytopic/topic-naming.adoc[Topic Naming] for more information.
48+
49+
[[x31-c]]
50+
=== Listener Container Changes
51+
52+
When manually assigning partitions, with a `null` consumer `group.id`, the `AckMode` is now automatically coerced to `MANUAL`.
53+
See xref:tips.adoc#tip-assign-all-parts[Manually Assigning All Partitions] for more information.
54+
55+
56+
[[what-s-new-in-3-0-since-2-9]]
557
== What's New in 3.0 Since 2.9
658

759
[[x30-kafka-client]]

0 commit comments

Comments
 (0)