https://github.com/spring-projects/spring-framework/issues/26482

1. build.gradle: comment io.spring.gradle-enterprise-conventions plugin
2. gradle.properties: set version=5.2.8.RELEASE-SHUTDOWN
3. ScheduledTaskRegistrar: shutdown taskScheduler in destroy()
4. ScheduledAnnotationBeanPostProcessor: do not cancel tasks in destroy()

Author: savinov

build.gradle

@@ -3,7 +3,7 @@ plugins {
 	id 'org.jetbrains.kotlin.jvm' version '1.3.72' apply false
 	id 'org.jetbrains.dokka' version '0.10.1' apply false
 	id 'org.asciidoctor.jvm.convert' version '2.4.0'
-	id 'io.spring.gradle-enterprise-conventions' version '0.0.2'
+//	id 'io.spring.gradle-enterprise-conventions' version '0.0.2'
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
 	id 'de.undercouch.download' version '4.0.0'
 	id 'com.gradle.build-scan' version '3.2'

gradle.properties

@@ -1,4 +1,4 @@
-version=5.2.8.RELEASE
+version=5.2.8.RELEASE-SHUTDOWN
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java

@@ -579,16 +579,10 @@ public boolean requiresDestruction(Object bean) {
 
 	@Override
 	public void destroy() {
+		this.registrar.destroy();
 		synchronized (this.scheduledTasks) {
-			Collection<Set<ScheduledTask>> allTasks = this.scheduledTasks.values();
-			for (Set<ScheduledTask> tasks : allTasks) {
-				for (ScheduledTask task : tasks) {
-					task.cancel();
-				}
-			}
 			this.scheduledTasks.clear();
 		}
-		this.registrar.destroy();
 	}
 
 }

spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java

@@ -33,6 +33,7 @@
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
+import org.springframework.scheduling.concurrent.ExecutorConfigurationSupport;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -551,6 +552,9 @@ public Set<ScheduledTask> getScheduledTasks() {
 
 	@Override
 	public void destroy() {
+		if (this.taskScheduler instanceof ExecutorConfigurationSupport) {
+			((ExecutorConfigurationSupport) this.taskScheduler).shutdown();
+		}
 		for (ScheduledTask task : this.scheduledTasks) {
 			task.cancel();
 		}