From a32cd4b551e577d39f53adb1e991dc77a6cad847 Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@foxmail.com>
Date: Fri, 29 Aug 2025 11:28:14 +0800
Subject: [PATCH] Upgrade to Spring Boot 3.5.5 (#7715)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### What type of PR is this?

/kind improvement
/area core
/milestone 2.21.x

#### What this PR does / why we need it:

This PR is a regular update for Spring Boot. See https://github.com/spring-projects/spring-boot/releases/tag/v3.5.5 for more.

#### Does this PR introduce a user-facing change?

```release-note
升级依赖 Spring Boot 至 3.5.5
```
---
 .../run/halo/app/extension/controller/DefaultController.java | 5 ++++-
 gradle/libs.versions.toml                                    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/run/halo/app/extension/controller/DefaultController.java b/api/src/main/java/run/halo/app/extension/controller/DefaultController.java
index d02279f26..7253ecb9d 100644
--- a/api/src/main/java/run/halo/app/extension/controller/DefaultController.java
+++ b/api/src/main/java/run/halo/app/extension/controller/DefaultController.java
@@ -114,7 +114,10 @@ public class DefaultController<R> implements Controller {
         return new SimpleAsyncTaskExecutorBuilder()
             .virtualThreads(virtualThreads)
             .concurrencyLimit(workerCount)
-            .taskTerminationTimeout(Duration.ofSeconds(10))
+            // See https://github.com/spring-projects/spring-framework/issues/35254#issuecomment-3212944107
+            // for more
+            // After the problem resolved, we can set the task termination timeout
+            // .taskTerminationTimeout(Duration.ofSeconds(10))
             .threadNamePrefix(name + "-")
             .build();
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 93b477cce..f41951d7c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ apache = ['apache-commons-lang3', 'apache-tika-core']
 therapi = ['therapi-runtime-javadoc', 'therapi-runtime-javadoc-scribe']
 
 [plugins]
-spring-boot = 'org.springframework.boot:3.5.4'
+spring-boot = 'org.springframework.boot:3.5.5'
 spring-dependency-management = 'io.spring.dependency-management:1.1.7'
 git-properties = 'com.gorylenko.gradle-git-properties:2.5.2'
 undercouch-download = 'de.undercouch.download:5.6.0'