From c40aab657f5fae39bcbcdd3d8f71736b8c9848bc Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 10 Oct 2014 14:08:24 -0700 Subject: [PATCH] Don't import JmsBootstrapConfiguration directly Remove the direct unconditional JmsBootstrapConfiguration @Import from JmsAnnotationDrivenConfiguration in favor of the nested EnableJmsConfiguration class. Fixes gh-1513 --- .../autoconfigure/jms/JmsAnnotationDrivenConfiguration.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index 2feb63e04ca..5e6d69dafcb 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -24,9 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnJndi; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.jms.annotation.EnableJms; -import org.springframework.jms.annotation.JmsBootstrapConfiguration; import org.springframework.jms.config.DefaultJmsListenerContainerFactory; import org.springframework.jms.config.JmsListenerConfigUtils; import org.springframework.jms.support.destination.DestinationResolver; @@ -42,7 +40,6 @@ import org.springframework.transaction.PlatformTransactionManager; */ @Configuration @ConditionalOnClass(EnableJms.class) -@Import(JmsBootstrapConfiguration.class) class JmsAnnotationDrivenConfiguration { @Autowired(required = false)