Skip to content

Commit c8b7a17

Browse files
committed
Upgrade to Spring Kafka 2.8.3
Closes gh-29722
1 parent 880db30 commit c8b7a17

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -169,6 +169,7 @@ public void configure(ConcurrentKafkaListenerContainerFactory<Object, Object> li
169169
configureContainer(listenerFactory.getContainerProperties());
170170
}
171171

172+
@SuppressWarnings("deprecation")
172173
private void configureListenerFactory(ConcurrentKafkaListenerContainerFactory<Object, Object> factory) {
173174
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
174175
Listener properties = this.properties.getListener();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ void testConcurrentKafkaListenerContainerFactoryWithCustomRecordFilterStrategy()
508508
}
509509

510510
@Test
511+
@Deprecated
511512
void testConcurrentKafkaListenerContainerFactoryWithCustomErrorHandler() {
512513
this.contextRunner.withBean("errorHandler", ErrorHandler.class, () -> mock(ErrorHandler.class))
513514
.run((context) -> {
@@ -518,6 +519,7 @@ void testConcurrentKafkaListenerContainerFactoryWithCustomErrorHandler() {
518519
}
519520

520521
@Test
522+
@Deprecated
521523
void concurrentKafkaListenerContainerFactoryInBatchModeShouldUseBatchErrorHandler() {
522524
this.contextRunner.withBean("batchErrorHandler", BatchErrorHandler.class, () -> mock(BatchErrorHandler.class))
523525
.withPropertyValues("spring.kafka.listener.type=batch").run((context) -> {

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,7 @@ bom {
16731673
]
16741674
}
16751675
}
1676-
library("Spring Kafka", "2.8.2") {
1676+
library("Spring Kafka", "2.8.3") {
16771677
group("org.springframework.kafka") {
16781678
modules = [
16791679
"spring-kafka",

spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/kafka.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ include::{docs-java}/messaging/kafka/receiving/MyBean.java[]
4848
----
4949

5050
If a `KafkaTransactionManager` bean is defined, it is automatically associated to the container factory.
51-
Similarly, if a `RecordFilterStrategy`, `ErrorHandler`, `CommonErrorHandler`, `AfterRollbackProcessor` or `ConsumerAwareRebalanceListener` bean is defined, it is automatically associated to the default factory.
51+
Similarly, if a `RecordFilterStrategy`, `CommonErrorHandler`, `AfterRollbackProcessor` or `ConsumerAwareRebalanceListener` bean is defined, it is automatically associated to the default factory.
5252

5353
Depending on the listener type, a `RecordMessageConverter` or `BatchMessageConverter` bean is associated to the default factory.
5454
If only a `RecordMessageConverter` bean is present for a batch listener, it is wrapped in a `BatchMessageConverter`.

0 commit comments

Comments
 (0)