Merge branch '1.5.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java

@@ -69,6 +69,7 @@ public class AuditAutoConfiguration {
 		return new AuthorizationAuditListener();
 	}
 
+	@Configuration
 	@ConditionalOnMissingBean(AuditEventRepository.class)
 	protected static class AuditEventRepositoryConfiguration {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java

@@ -82,12 +82,14 @@ class JmsAnnotationDrivenConfiguration {
 		return factory;
 	}
 
+	@Configuration
 	@EnableJms
 	@ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
 	protected static class EnableJmsConfiguration {
 
 	}
 
+	@Configuration
 	@ConditionalOnJndi
 	protected static class JndiConfiguration {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java

@@ -104,6 +104,7 @@ public class JmsAutoConfiguration {
 
 	}
 
+	@Configuration
 	@ConditionalOnClass(JmsMessagingTemplate.class)
 	@Import(JmsTemplateConfiguration.class)
 	protected static class MessagingTemplateConfiguration {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

@@ -53,6 +53,7 @@ class ActiveMQConnectionFactoryConfiguration {
 						.createConnectionFactory(ActiveMQConnectionFactory.class);
 	}
 
+	@Configuration
 	@ConditionalOnClass(PooledConnectionFactory.class)
 	static class PooledConnectionFactoryConfiguration {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java

@@ -73,6 +73,7 @@ class KafkaAnnotationDrivenConfiguration {
 		return factory;
 	}
 
+	@Configuration
 	@EnableKafka
 	@ConditionalOnMissingBean(name = KafkaListenerConfigUtils.KAFKA_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
 	protected static class EnableKafkaConfiguration {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java

@@ -123,6 +123,7 @@ class BitronixJtaConfiguration {
 		return jtaTransactionManager;
 	}
 
+	@Configuration
 	@ConditionalOnClass(Message.class)
 	static class BitronixJtaJmsConfiguration {