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

Revert to Spring Integration 6.0.0-RC1

Browse Source 
Latest snapshots contain breaking changes that we do not yet know how
to address.
This commit is contained in:
Andy Wilkinson 2022-11-05 13:39:45 +00:00
parent 7e6bc3fdca
commit 42f4fd7e41
2 changed files with 3 additions and 3 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/integration/IntegrationAutoConfigurationScanRegistrar.java
View File

@ -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<String> getBasePackages(AnnotationAttributes componentScan, BeanDefinitionRegistry registry) {
protected Collection<String> getBasePackages(AnnotationMetadata importingClassMetadata,
BeanDefinitionRegistry registry) {
return (AutoConfigurationPackages.has(this.beanFactory) ? AutoConfigurationPackages.get(this.beanFactory)
: Collections.emptyList());
}

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

@ -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"