From 7e6bc3fdca65f99d5379c22dbdf9a1f68689339e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Nov 2022 19:40:52 +0000 Subject: [PATCH] Adapt to breaking API change in Spring Integration See gh-33009 --- .../IntegrationAutoConfigurationScanRegistrar.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 cae4e57a79b..82c0ef4163d 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,6 +24,7 @@ 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; @@ -52,8 +53,7 @@ class IntegrationAutoConfigurationScanRegistrar extends IntegrationComponentScan } @Override - protected Collection getBasePackages(AnnotationMetadata importingClassMetadata, - BeanDefinitionRegistry registry) { + protected Collection getBasePackages(AnnotationAttributes componentScan, BeanDefinitionRegistry registry) { return (AutoConfigurationPackages.has(this.beanFactory) ? AutoConfigurationPackages.get(this.beanFactory) : Collections.emptyList()); }