Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-02-18 21:25:25 +01:00
commit ddfdc48161
1 changed files with 2 additions and 0 deletions

View File

@ -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;
@ -43,6 +44,7 @@ import org.springframework.scheduling.config.TaskManagementConfigUtils;
@ConditionalOnClass(ThreadPoolTaskScheduler.class)
@Configuration
@EnableConfigurationProperties(TaskSchedulingProperties.class)
@AutoConfigureAfter(TaskExecutionAutoConfiguration.class)
public class TaskSchedulingAutoConfiguration {
@Bean