Merge branch '2.7.x'

Closes gh-33284
spring-projects · Nov 21, 2022 · d89861e · d89861e
2 parents cb14089 + 78d8bfd
commit d89861e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfiguration.java
@@ -54,6 +54,7 @@ public ThreadPoolTaskScheduler taskScheduler(TaskSchedulerBuilder builder) {
 	}
 
 	@Bean
+	@ConditionalOnBean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)
 	public static LazyInitializationExcludeFilter scheduledBeanLazyInitializationExcludeFilter() {
 		return new ScheduledBeanLazyInitializationExcludeFilter();
 	}

diff --git a/...ava/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java b/...ava/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,6 +61,12 @@ void noSchedulingDoesNotExposeTaskScheduler() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(TaskScheduler.class));
 	}
 
+	@Test
+	void noSchedulingDoesNotExposeScheduledBeanLazyInitializationExcludeFilter() {
+		this.contextRunner.run(
+				(context) -> assertThat(context).doesNotHaveBean(ScheduledBeanLazyInitializationExcludeFilter.class));
+	}
+
 	@Test
 	void enableSchedulingWithNoTaskExecutorAutoConfiguresOne() {
 		this.contextRunner