From e546ed4834caadd5b40f555c9a4f5a6fef95fdfe Mon Sep 17 00:00:00 2001
From: isank <isankagarwal@gmail.com>
Date: Mon, 18 Feb 2019 23:29:40 +0530
Subject: [PATCH] Order TaskExecution auto-config before TaskScheduling
 auto-config

See gh-15984
---
 .../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 f87ace5d99..b41045f9f9 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 @@ package org.springframework.boot.autoconfigure.task;
 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 @@ import org.springframework.scheduling.config.TaskManagementConfigUtils;
 @ConditionalOnClass(ThreadPoolTaskScheduler.class)
 @Configuration
 @EnableConfigurationProperties(TaskSchedulingProperties.class)
+@AutoConfigureAfter(TaskExecutionAutoConfiguration.class)
 public class TaskSchedulingAutoConfiguration {
 
 	@Bean