Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start building against Spring Kafka 3.2.0 snapshots

Browse Source 
See gh-39897
This commit is contained in:
Andy Wilkinson 2024-03-11 20:36:31 +00:00
parent c630bad519
commit 25ffa09731
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -237,7 +237,7 @@ public class ConcurrentKafkaListenerContainerFactoryConfigurer {
map.from(properties::isMissingTopicsFatal).to(container::setMissingTopicsFatal); map.from(properties::isMissingTopicsFatal).to(container::setMissingTopicsFatal);
map.from(properties::isImmediateStop).to(container::setStopImmediate); map.from(properties::isImmediateStop).to(container::setStopImmediate);
map.from(properties::isObservationEnabled).to(container::setObservationEnabled); map.from(properties::isObservationEnabled).to(container::setObservationEnabled);
map.from(this.transactionManager).to(container::setTransactionManager); map.from(this.transactionManager).to(container::setKafkaAwareTransactionManager);
map.from(this.rebalanceListener).to(container::setConsumerRebalanceListener); map.from(this.rebalanceListener).to(container::setConsumerRebalanceListener);
map.from(this.listenerTaskExecutor).to(container::setListenerTaskExecutor); map.from(this.listenerTaskExecutor).to(container::setListenerTaskExecutor);
} }

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

@ -743,7 +743,7 @@ class KafkaAutoConfigurationTests {
assertThat(context).hasSingleBean(KafkaAwareTransactionManager.class); assertThat(context).hasSingleBean(KafkaAwareTransactionManager.class);
ConcurrentKafkaListenerContainerFactory<?, ?> factory = context ConcurrentKafkaListenerContainerFactory<?, ?> factory = context
.getBean(ConcurrentKafkaListenerContainerFactory.class); .getBean(ConcurrentKafkaListenerContainerFactory.class);
assertThat(factory.getContainerProperties().getTransactionManager()) assertThat(factory.getContainerProperties().getKafkaAwareTransactionManager())
.isSameAs(context.getBean(KafkaAwareTransactionManager.class)); .isSameAs(context.getBean(KafkaAwareTransactionManager.class));
}); });
} }
@ -758,7 +758,7 @@ class KafkaAutoConfigurationTests {
.run((context) -> { .run((context) -> {
ConcurrentKafkaListenerContainerFactory<?, ?> factory = context ConcurrentKafkaListenerContainerFactory<?, ?> factory = context
.getBean(ConcurrentKafkaListenerContainerFactory.class); .getBean(ConcurrentKafkaListenerContainerFactory.class);
assertThat(factory.getContainerProperties().getTransactionManager()) assertThat(factory.getContainerProperties().getKafkaAwareTransactionManager())
.isSameAs(context.getBean("customTransactionManager")); .isSameAs(context.getBean("customTransactionManager"));
}); });
} }

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1891,7 +1891,7 @@ bom {
releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}") releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}")
} }
} }
library("Spring Kafka", "3.2.0-M1") { library("Spring Kafka", "3.2.0-SNAPSHOT") {
considerSnapshots() considerSnapshots()
group("org.springframework.kafka") { group("org.springframework.kafka") {
modules = [ modules = [