From 049df50f31f3e94bf63ba937134f2f4bc5b3fbed Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 27 Aug 2017 14:25:01 +0200 Subject: [PATCH] Add explicit dependency to ConnectionFactory auto-configurations This commit makes sure tht `HealthIndicatorAutoConfiguration` runs after any producers of a `ConnectionFactory` and not only ActiveMQ. This was identified as part of #10081: `JmsAutoConfiguration` is actually the one that isn't necessary (spring-boot-actuator has no import on the `org.springframework.jms` and only `javax.jms.ConnectionFactory` is used as part of the JMS health indicator. --- .../health/HealthIndicatorAutoConfiguration.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java index a35ac27736f..d0c976610cd 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java @@ -69,8 +69,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadata; 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.jms.artemis.ArtemisAutoConfiguration; import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration; @@ -101,10 +101,10 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; */ @Configuration @AutoConfigureBefore({ EndpointAutoConfiguration.class }) -@AutoConfigureAfter({ ActiveMQAutoConfiguration.class, CassandraAutoConfiguration.class, - CassandraDataAutoConfiguration.class, CouchbaseDataAutoConfiguration.class, - DataSourceAutoConfiguration.class, ElasticsearchAutoConfiguration.class, - JestAutoConfiguration.class, JmsAutoConfiguration.class, +@AutoConfigureAfter({ ActiveMQAutoConfiguration.class, ArtemisAutoConfiguration.class, + CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, + CouchbaseDataAutoConfiguration.class, DataSourceAutoConfiguration.class, + ElasticsearchAutoConfiguration.class, JestAutoConfiguration.class, LdapDataAutoConfiguration.class, MailSenderAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, Neo4jDataAutoConfiguration.class, RabbitAutoConfiguration.class,