From 2d1f5d3bc1dfcadcc5f31aaa2e9d5853d6396f74 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:48:40 +0100 Subject: [PATCH 01/16] Start building against Reactor 2020.0.17 snapshots See gh-30176 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a99b202e80..dbe1c3d97c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1455,7 +1455,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.16") { + library("Reactor Bom", "2020.0.17-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom" From 71e6a836a61a16ffa6dd91c22434385ad11cbd33 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:50:03 +0100 Subject: [PATCH 02/16] Start building against Spring Framework 5.3.17 snapshots See gh-30177 --- .../properties/ConfigurationPropertiesReportEndpoint.java | 3 ++- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../ConfigurationPropertiesBindConstructorProvider.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java index 99ff2500b0..3b24c4d763 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -554,6 +554,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext return StringUtils.capitalize(propertyName); } + @SuppressWarnings("deprecation") private Constructor findBindConstructor(Class type) { boolean classConstructorBinding = MergedAnnotations .from(type, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index dbe1c3d97c..f3583b78f8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1699,7 +1699,7 @@ bom { ] } } - library("Spring Framework", "5.3.16") { + library("Spring Framework", "5.3.17-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom" diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java index 86efdc9f08..0e0051497a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,6 +85,7 @@ class ConfigurationPropertiesBindConstructorProvider implements BindConstructorP return (superclass != null) && "java.lang.Record".equals(superclass.getName()); } + @SuppressWarnings("deprecation") private boolean isConstructorBindingAnnotatedType(Class type) { return MergedAnnotations.from(type, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES) .isPresent(ConstructorBinding.class); From 33ec810b2e7c5382c4ef36d606b6443355d25eb9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:50:33 +0100 Subject: [PATCH 03/16] Start building against Micrometer 1.8.4 snapshots See gh-30178 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f3583b78f8..98a824b27e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1248,7 +1248,7 @@ bom { ] } } - library("Micrometer", "1.8.3") { + library("Micrometer", "1.8.4-SNAPSHOT") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From 64d706026d68dd4a9b5ed58926d32bd4fcf6d3e1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:50:59 +0100 Subject: [PATCH 04/16] Start building against Spring Data 2021.1.3 snapshots See gh-30179 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 98a824b27e..9f920b6a37 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1692,7 +1692,7 @@ bom { ] } } - library("Spring Data Bom", "2021.1.2") { + library("Spring Data Bom", "2021.1.3-SNAPSHOT") { group("org.springframework.data") { imports = [ "spring-data-bom" From 31fb515d16e4b6609c6b1c5f59e7669557e916f5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:51:33 +0100 Subject: [PATCH 05/16] Start building against Spring AMQP 2.4.3 snapshots See gh-30180 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 9f920b6a37..b769707444 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1671,7 +1671,7 @@ bom { ] } } - library("Spring AMQP", "2.4.2") { + library("Spring AMQP", "2.4.3-SNAPSHOT") { group("org.springframework.amqp") { modules = [ "spring-amqp", From 001bc04c8cde2c3647d90ac3e5edd5a523d1b0af Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:00:10 +0100 Subject: [PATCH 06/16] Start building against Reactor 2020.0.17 snapshots See gh-30187 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 7937582a3b..c017f68a81 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1429,7 +1429,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.16") { + library("Reactor Bom", "2020.0.17-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom" From 6baa248228fa0932743de322f70c99e76f9248b6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:01:44 +0100 Subject: [PATCH 07/16] Start building against Spring Framework 5.3.17 snapshots See gh-30188 --- .../properties/ConfigurationPropertiesReportEndpoint.java | 3 ++- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../ConfigurationPropertiesBindConstructorProvider.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java index 99ff2500b0..3b24c4d763 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -554,6 +554,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext return StringUtils.capitalize(propertyName); } + @SuppressWarnings("deprecation") private Constructor findBindConstructor(Class type) { boolean classConstructorBinding = MergedAnnotations .from(type, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c017f68a81..141b68b122 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1675,7 +1675,7 @@ bom { ] } } - library("Spring Framework", "5.3.16") { + library("Spring Framework", "5.3.17-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom" diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java index 86efdc9f08..0e0051497a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,6 +85,7 @@ class ConfigurationPropertiesBindConstructorProvider implements BindConstructorP return (superclass != null) && "java.lang.Record".equals(superclass.getName()); } + @SuppressWarnings("deprecation") private boolean isConstructorBindingAnnotatedType(Class type) { return MergedAnnotations.from(type, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES) .isPresent(ConstructorBinding.class); From 6c1e194dd41de7a66873f51d7ffbf9a142bfc250 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:02:24 +0100 Subject: [PATCH 08/16] Start building against Spring Data 2021.2.0-M4 snapshots See gh-30185 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 141b68b122..f59479c3f7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1668,7 +1668,7 @@ bom { ] } } - library("Spring Data Bom", "2021.2.0-M3") { + library("Spring Data Bom", "2021.2.0-SNAPSHOT") { group("org.springframework.data") { imports = [ "spring-data-bom" From 4ca6cffd87ef5ccdfb712980bcd24986e495d056 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:02:54 +0100 Subject: [PATCH 09/16] Start building against Spring AMQP 2.4.3 snapshots See gh-30189 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f59479c3f7..94d2770ad4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1647,7 +1647,7 @@ bom { ] } } - library("Spring AMQP", "2.4.2") { + library("Spring AMQP", "2.4.3-SNAPSHOT") { group("org.springframework.amqp") { modules = [ "spring-amqp", From 3717c4c8834301c461bada15060372f0e1511a2a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:52:03 +0100 Subject: [PATCH 10/16] Start building against Spring Kafka 2.8.4 snapshots See gh-30181 --- ...rentKafkaListenerContainerFactoryConfigurer.java | 1 + .../boot/autoconfigure/kafka/KafkaProperties.java | 6 +++++- .../kafka/KafkaAutoConfigurationTests.java | 13 +++++++++++-- .../autoconfigure/kafka/KafkaPropertiesTests.java | 3 +-- .../spring-boot-dependencies/build.gradle | 2 +- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java index c456798475..4f3178c3aa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java @@ -189,6 +189,7 @@ public class ConcurrentKafkaListenerContainerFactoryConfigurer { map.from(this.recordInterceptor).to(factory::setRecordInterceptor); } + @SuppressWarnings("deprecation") private void configureContainer(ContainerProperties container) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); Listener properties = this.properties.getListener(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index e7054900f5..60595c000d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException; import org.springframework.boot.convert.DurationUnit; @@ -1022,10 +1023,13 @@ public class KafkaProperties { this.logContainerConfig = logContainerConfig; } + @Deprecated + @DeprecatedConfigurationProperty(reason = "Use KafkaUtils#setConsumerRecordFormatter instead.") public boolean isOnlyLogRecordMetadata() { return this.onlyLogRecordMetadata; } + @Deprecated public void setOnlyLogRecordMetadata(boolean onlyLogRecordMetadata) { this.onlyLogRecordMetadata = onlyLogRecordMetadata; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index 08790d0c8b..405fe04c36 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -390,7 +390,6 @@ class KafkaAutoConfigurationTests { "spring.kafka.listener.no-poll-threshold=2.5", "spring.kafka.listener.type=batch", "spring.kafka.listener.idle-between-polls=1s", "spring.kafka.listener.idle-event-interval=1s", "spring.kafka.listener.monitor-interval=45", "spring.kafka.listener.log-container-config=true", - "spring.kafka.listener.only-log-record-metadata=true", "spring.kafka.listener.missing-topics-fatal=true", "spring.kafka.jaas.enabled=true", "spring.kafka.producer.transaction-id-prefix=foo", "spring.kafka.jaas.login-module=foo", "spring.kafka.jaas.control-flag=REQUISITE", "spring.kafka.jaas.options.useKeyTab=true") @@ -417,7 +416,6 @@ class KafkaAutoConfigurationTests { assertThat(containerProperties.getIdleEventInterval()).isEqualTo(1000L); assertThat(containerProperties.getMonitorInterval()).isEqualTo(45); assertThat(containerProperties.isLogContainerConfig()).isTrue(); - assertThat(containerProperties.isOnlyLogRecordMetadata()).isTrue(); assertThat(containerProperties.isMissingTopicsFatal()).isTrue(); assertThat(kafkaListenerContainerFactory).extracting("concurrency").isEqualTo(3); assertThat(kafkaListenerContainerFactory.isBatchListener()).isTrue(); @@ -432,6 +430,17 @@ class KafkaAutoConfigurationTests { }); } + @Test + @Deprecated + void logOnlyRecordMetadataProperty() { + this.contextRunner.withPropertyValues("spring.kafka.listener.only-log-record-metadata=true").run((context) -> { + AbstractKafkaListenerContainerFactory kafkaListenerContainerFactory = (AbstractKafkaListenerContainerFactory) context + .getBean(KafkaListenerContainerFactory.class); + ContainerProperties containerProperties = kafkaListenerContainerFactory.getContainerProperties(); + assertThat(containerProperties.isOnlyLogRecordMetadata()).isTrue(); + }); + } + @Test void testKafkaTemplateRecordMessageConverters() { this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java index 189073952c..620e0b25ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,6 @@ class KafkaPropertiesTests { void listenerDefaultValuesAreConsistent() { ContainerProperties container = new ContainerProperties("test"); Listener listenerProperties = new KafkaProperties().getListener(); - assertThat(listenerProperties.isOnlyLogRecordMetadata()).isEqualTo(container.isOnlyLogRecordMetadata()); assertThat(listenerProperties.isMissingTopicsFatal()).isEqualTo(container.isMissingTopicsFatal()); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b769707444..5c1ebadfeb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1720,7 +1720,7 @@ bom { ] } } - library("Spring Kafka", "2.8.3") { + library("Spring Kafka", "2.8.4-SNAPSHOT") { group("org.springframework.kafka") { modules = [ "spring-kafka", From 15c2eb9c9cbe64ae2213f4571bb51464b47195c4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:52:36 +0100 Subject: [PATCH 11/16] Start building against Spring WS 3.1.3 snapshots See gh-30182 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5c1ebadfeb..d9afee1673 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1772,7 +1772,7 @@ bom { ] } } - library("Spring WS", "3.1.2") { + library("Spring WS", "3.1.3-SNAPSHOT") { group("org.springframework.ws") { modules = [ "spring-ws-core", From 2da206d2b90236c2ccd0e18e03e4c2a087e194fa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 11:53:00 +0100 Subject: [PATCH 12/16] Start building against Spring Integration 5.5.10 snapshots See gh-30183 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d9afee1673..485a7cffea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1713,7 +1713,7 @@ bom { ] } } - library("Spring Integration", "5.5.9") { + library("Spring Integration", "5.5.10-SNAPSHOT") { group("org.springframework.integration") { imports = [ "spring-integration-bom" From 695685996a6479bd85b892a43e3173f7555ef727 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:03:26 +0100 Subject: [PATCH 13/16] Start building against Spring Kafka 2.8.4 snapshots See gh-30190 --- ...fkaListenerContainerFactoryConfigurer.java | 1 + .../autoconfigure/kafka/KafkaProperties.java | 4 ++++ .../kafka/KafkaAutoConfigurationTests.java | 23 +++++++++++++------ .../kafka/KafkaPropertiesTests.java | 3 +-- .../spring-boot-dependencies/build.gradle | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java index f8d24a790a..2f3f56841f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java @@ -189,6 +189,7 @@ public class ConcurrentKafkaListenerContainerFactoryConfigurer { map.from(this.recordInterceptor).to(factory::setRecordInterceptor); } + @SuppressWarnings("deprecation") private void configureContainer(ContainerProperties container) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); Listener properties = this.properties.getListener(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index 3d15670cef..e109753d73 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -34,6 +34,7 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException; import org.springframework.boot.convert.DurationUnit; @@ -1056,10 +1057,13 @@ public class KafkaProperties { this.logContainerConfig = logContainerConfig; } + @Deprecated + @DeprecatedConfigurationProperty(reason = "Use KafkaUtils#setConsumerRecordFormatter instead.") public boolean isOnlyLogRecordMetadata() { return this.onlyLogRecordMetadata; } + @Deprecated public void setOnlyLogRecordMetadata(boolean onlyLogRecordMetadata) { this.onlyLogRecordMetadata = onlyLogRecordMetadata; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index 12f98a7824..770d3d746c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -390,12 +390,11 @@ class KafkaAutoConfigurationTests { "spring.kafka.listener.type=batch", "spring.kafka.listener.idle-between-polls=1s", "spring.kafka.listener.idle-event-interval=1s", "spring.kafka.listener.idle-partition-event-interval=1s", "spring.kafka.listener.monitor-interval=45", - "spring.kafka.listener.log-container-config=true", - "spring.kafka.listener.only-log-record-metadata=true", - "spring.kafka.listener.missing-topics-fatal=true", "spring.kafka.jaas.enabled=true", - "spring.kafka.listener.immediate-stop=true", "spring.kafka.producer.transaction-id-prefix=foo", - "spring.kafka.jaas.login-module=foo", "spring.kafka.jaas.control-flag=REQUISITE", - "spring.kafka.jaas.options.useKeyTab=true").run((context) -> { + "spring.kafka.listener.log-container-config=true", "spring.kafka.listener.missing-topics-fatal=true", + "spring.kafka.jaas.enabled=true", "spring.kafka.listener.immediate-stop=true", + "spring.kafka.producer.transaction-id-prefix=foo", "spring.kafka.jaas.login-module=foo", + "spring.kafka.jaas.control-flag=REQUISITE", "spring.kafka.jaas.options.useKeyTab=true") + .run((context) -> { DefaultKafkaProducerFactory producerFactory = context .getBean(DefaultKafkaProducerFactory.class); DefaultKafkaConsumerFactory consumerFactory = context @@ -420,7 +419,6 @@ class KafkaAutoConfigurationTests { assertThat(containerProperties.getIdlePartitionEventInterval()).isEqualTo(1000L); assertThat(containerProperties.getMonitorInterval()).isEqualTo(45); assertThat(containerProperties.isLogContainerConfig()).isTrue(); - assertThat(containerProperties.isOnlyLogRecordMetadata()).isTrue(); assertThat(containerProperties.isMissingTopicsFatal()).isTrue(); assertThat(containerProperties.isStopImmediate()).isTrue(); assertThat(kafkaListenerContainerFactory).extracting("concurrency").isEqualTo(3); @@ -436,6 +434,17 @@ class KafkaAutoConfigurationTests { }); } + @Test + @Deprecated + void logOnlyRecordMetadataProperty() { + this.contextRunner.withPropertyValues("spring.kafka.listener.only-log-record-metadata=true").run((context) -> { + AbstractKafkaListenerContainerFactory kafkaListenerContainerFactory = (AbstractKafkaListenerContainerFactory) context + .getBean(KafkaListenerContainerFactory.class); + ContainerProperties containerProperties = kafkaListenerContainerFactory.getContainerProperties(); + assertThat(containerProperties.isOnlyLogRecordMetadata()).isTrue(); + }); + } + @Test void testKafkaTemplateRecordMessageConverters() { this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java index 189073952c..620e0b25ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,6 @@ class KafkaPropertiesTests { void listenerDefaultValuesAreConsistent() { ContainerProperties container = new ContainerProperties("test"); Listener listenerProperties = new KafkaProperties().getListener(); - assertThat(listenerProperties.isOnlyLogRecordMetadata()).isEqualTo(container.isOnlyLogRecordMetadata()); assertThat(listenerProperties.isMissingTopicsFatal()).isEqualTo(container.isMissingTopicsFatal()); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 94d2770ad4..3cb6eb0a0e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1704,7 +1704,7 @@ bom { ] } } - library("Spring Kafka", "2.8.3") { + library("Spring Kafka", "2.8.4-SNAPSHOT") { group("org.springframework.kafka") { modules = [ "spring-kafka", From 85d4a070389238d8c2554b9d891886df36a89a75 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:03:57 +0100 Subject: [PATCH 14/16] Start building against Spring Security 5.7.0-M3 snapshots See gh-30191 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 3cb6eb0a0e..b1fe74cb62 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1742,7 +1742,7 @@ bom { ] } } - library("Spring Security", "5.7.0-M2") { + library("Spring Security", "5.7.0-SNAPSHOT") { group("org.springframework.security") { imports = [ "spring-security-bom" From ddf778e1cc67880c78d900ad9ddf8899fb75315e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:04:24 +0100 Subject: [PATCH 15/16] Start building against Spring WS 3.1.3 snapshots See gh-30192 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b1fe74cb62..0c0e2d68b1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1756,7 +1756,7 @@ bom { ] } } - library("Spring WS", "3.1.2") { + library("Spring WS", "3.1.3-SNAPSHOT") { group("org.springframework.ws") { modules = [ "spring-ws-core", From 01a7cfa97950ecd34abf78cfe4d7835c2e56570d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 12 Mar 2022 12:04:53 +0100 Subject: [PATCH 16/16] Start building against Spring Integration 5.5.10 snapshots See gh-30193 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 0c0e2d68b1..9400950586 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1697,7 +1697,7 @@ bom { ] } } - library("Spring Integration", "5.5.9") { + library("Spring Integration", "5.5.10-SNAPSHOT") { group("org.springframework.integration") { imports = [ "spring-integration-bom"