From 42f4fd7e416dcca52be771333e339826b5b5951b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 5 Nov 2022 13:39:45 +0000 Subject: [PATCH] Revert to Spring Integration 6.0.0-RC1 Latest snapshots contain breaking changes that we do not yet know how to address. --- .../IntegrationAutoConfigurationScanRegistrar.java | 4 ++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java index 82c0ef4163..cae4e57a79 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java @@ -24,7 +24,6 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; -import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.config.IntegrationComponentScanRegistrar; @@ -53,7 +52,8 @@ class IntegrationAutoConfigurationScanRegistrar extends IntegrationComponentScan } @Override - protected Collection getBasePackages(AnnotationAttributes componentScan, BeanDefinitionRegistry registry) { + protected Collection getBasePackages(AnnotationMetadata importingClassMetadata, + BeanDefinitionRegistry registry) { return (AutoConfigurationPackages.has(this.beanFactory) ? AutoConfigurationPackages.get(this.beanFactory) : Collections.emptyList()); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 910fa2a739..20c6fd1ce1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1448,7 +1448,7 @@ bom { ] } } - library("Spring Integration", "6.0.0-SNAPSHOT") { + library("Spring Integration", "6.0.0-RC1") { group("org.springframework.integration") { imports = [ "spring-integration-bom"