Skip to content

Commit 9938d1f

Browse files
committed
Order IntegrationAutoConfiguration properly
This commit makes sure that the auto-configuration for Spring Integration runs after the datasource has been auto-configured if necessary as there is an optional part that can initialize the jdbc schema. Closes gh-14175
1 parent 7c3d863 commit 9938d1f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
3131
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
32+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
3233
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
3334
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3435
import org.springframework.context.EnvironmentAware;
@@ -60,7 +61,7 @@
6061
@Configuration
6162
@ConditionalOnClass(EnableIntegration.class)
6263
@EnableConfigurationProperties(IntegrationProperties.class)
63-
@AutoConfigureAfter(JmxAutoConfiguration.class)
64+
@AutoConfigureAfter({ DataSourceAutoConfiguration.class, JmxAutoConfiguration.class })
6465
public class IntegrationAutoConfiguration {
6566

6667
/**

0 commit comments

Comments
 (0)