From 61614e3ffb3be76c5a42369872ff7ee9cb5ab0d0 Mon Sep 17 00:00:00 2001 From: isank Date: Mon, 18 Feb 2019 23:29:40 +0530 Subject: [PATCH] Explicitly order TaskExecutionAutoConfiguration before TaskSchedulerAutoConfiguration - Fixes gh-15983 --- .../autoconfigure/task/TaskSchedulingAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java index f87ace5d99d0..b41045f9f90b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java @@ -19,6 +19,7 @@ import java.util.concurrent.ScheduledExecutorService; import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -42,6 +43,7 @@ @ConditionalOnClass(ThreadPoolTaskScheduler.class) @Configuration @EnableConfigurationProperties(TaskSchedulingProperties.class) +@AutoConfigureAfter(TaskExecutionAutoConfiguration.class) public class TaskSchedulingAutoConfiguration { @Bean