File tree Expand file tree Collapse file tree 1 file changed +12
-0
lines changed
spring-integration-core/src/main/java/org/springframework/integration/config Expand file tree Collapse file tree 1 file changed +12
-0
lines changed Original file line number Diff line number Diff line change 3838import org .springframework .beans .factory .support .ManagedList ;
3939import org .springframework .beans .factory .support .ManagedSet ;
4040import org .springframework .beans .factory .support .RootBeanDefinition ;
41+ import org .springframework .context .ApplicationContextException ;
4142import org .springframework .context .annotation .ImportBeanDefinitionRegistrar ;
4243import org .springframework .core .io .Resource ;
4344import org .springframework .core .io .support .PathMatchingResourcePatternResolver ;
@@ -85,6 +86,17 @@ public void setBeanClassLoader(ClassLoader classLoader) {
8586 this .classLoader = classLoader ;
8687 }
8788
89+ static {
90+ if (ClassUtils .isPresent ("org.springframework.integration.dsl.support.Function" ,
91+ IntegrationRegistrar .class .getClassLoader ())) {
92+
93+ throw new ApplicationContextException ("Starting with Spring Integration 5.0, "
94+ + "the 'spring-integration-java-dsl' dependency is no longer needed; "
95+ + "the Java DSL has been merged into the core project. "
96+ + "Having it present it on the classpath causes class loading conflicts." );
97+ }
98+ }
99+
88100 /**
89101 * Invoked by the framework when an @EnableIntegration annotation is encountered.
90102 * Also called with {@code null} {@code importingClassMetadata} from {@code AbstractIntegrationNamespaceHandler}
You can’t perform that action at this time.
0 commit comments