Commit c40aab65 authored by Phillip Webb's avatar Phillip Webb

Don't import JmsBootstrapConfiguration directly

Remove the direct unconditional JmsBootstrapConfiguration @Import from
JmsAnnotationDrivenConfiguration in favor of the nested
EnableJmsConfiguration class.

Fixes gh-1513
parent 517b40d9
...@@ -24,9 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnJndi; ...@@ -24,9 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnJndi;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.jms.annotation.EnableJms; import org.springframework.jms.annotation.EnableJms;
import org.springframework.jms.annotation.JmsBootstrapConfiguration;
import org.springframework.jms.config.DefaultJmsListenerContainerFactory; import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
import org.springframework.jms.config.JmsListenerConfigUtils; import org.springframework.jms.config.JmsListenerConfigUtils;
import org.springframework.jms.support.destination.DestinationResolver; import org.springframework.jms.support.destination.DestinationResolver;
...@@ -42,7 +40,6 @@ import org.springframework.transaction.PlatformTransactionManager; ...@@ -42,7 +40,6 @@ import org.springframework.transaction.PlatformTransactionManager;
*/ */
@Configuration @Configuration
@ConditionalOnClass(EnableJms.class) @ConditionalOnClass(EnableJms.class)
@Import(JmsBootstrapConfiguration.class)
class JmsAnnotationDrivenConfiguration { class JmsAnnotationDrivenConfiguration {
@Autowired(required = false) @Autowired(required = false)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment