From cd23de6ed55ff2d27981a0f267a51e2130857097 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 19 Jul 2017 10:10:11 -0700 Subject: [PATCH] Add more HealthIndicatorAutoConfiguration ordering Update HealthIndicatorAutoConfiguration to ensure that it is configured after ActiveMQAutoConfiguration. Fixes gh-9793 --- .../autoconfigure/HealthIndicatorAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java index 4640ad8484..f371e0ee2a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java @@ -66,6 +66,7 @@ import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetada import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvider; import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProviders; import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; +import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration; import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration; @@ -95,7 +96,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; */ @Configuration @AutoConfigureBefore({ EndpointAutoConfiguration.class }) -@AutoConfigureAfter({ CassandraAutoConfiguration.class, +@AutoConfigureAfter({ ActiveMQAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, CouchbaseDataAutoConfiguration.class, DataSourceAutoConfiguration.class, ElasticsearchAutoConfiguration.class, JestAutoConfiguration.class, JmsAutoConfiguration.class,