root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Start building against Spring Integration 6.0.0-RC2 snapshots 

See gh-33009
This commit is contained in:
Phillip Webb 2022-11-07 14:31:01 -08:00
parent b67c427259
commit 95557ddbc6
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/integration/IntegrationAutoConfiguration.java
View File

@ -49,9 +49,9 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.config.EnableIntegrationManagement;
import org.springframework.integration.config.IntegrationComponentScanRegistrar;
import org.springframework.integration.config.IntegrationManagementConfigurer;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.gateway.GatewayProxyFactoryBean;
import org.springframework.integration.jdbc.store.JdbcMessageStore;
import org.springframework.integration.jmx.config.EnableIntegrationMBeanExport;
import org.springframework.integration.monitor.IntegrationMBeanExporter;
@ -220,7 +220,7 @@ public class IntegrationAutoConfiguration {
* Integration component scan configuration.
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(GatewayProxyFactoryBean.class)
@ConditionalOnMissingBean(IntegrationComponentScanRegistrar.class)
@Import(IntegrationAutoConfigurationScanRegistrar.class)
protected static class IntegrationComponentScanConfiguration {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java
View File

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

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

@ -1417,7 +1417,7 @@ bom {
]
}
}
library("Spring Integration", "6.0.0-RC1") {
library("Spring Integration", "6.0.0-SNAPSHOT") {
group("org.springframework.integration") {
imports = [
"spring-integration-bom"