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 38
38
import org .springframework .beans .factory .support .ManagedList ;
39
39
import org .springframework .beans .factory .support .ManagedSet ;
40
40
import org .springframework .beans .factory .support .RootBeanDefinition ;
41
+ import org .springframework .context .ApplicationContextException ;
41
42
import org .springframework .context .annotation .ImportBeanDefinitionRegistrar ;
42
43
import org .springframework .core .io .Resource ;
43
44
import org .springframework .core .io .support .PathMatchingResourcePatternResolver ;
@@ -85,6 +86,17 @@ public void setBeanClassLoader(ClassLoader classLoader) {
85
86
this .classLoader = classLoader ;
86
87
}
87
88
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
+
88
100
/**
89
101
* Invoked by the framework when an @EnableIntegration annotation is encountered.
90
102
* Also called with {@code null} {@code importingClassMetadata} from {@code AbstractIntegrationNamespaceHandler}
You can’t perform that action at this time.
0 commit comments