From 7c0e23d700dd9504fc66a91ec643b61b293daaf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 21:17:44 +0000
Subject: [PATCH 1/2] build(deps): bump
 org.springframework.boot:spring-boot-starter-actuator

Bumps [org.springframework.boot:spring-boot-starter-actuator](https://github.com/spring-projects/spring-boot) from 3.5.11 to 3.5.12.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.11...v3.5.12)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-actuator
  dependency-version: 3.5.12
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8002eaa91a8..bfdb6f19441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
     <!-- For unify spring boot 3 version -->
     <spring-6.version>6.2.17</spring-6.version>
     <spring-security-6.version>6.5.8</spring-security-6.version>
-    <spring-boot-3.version>3.5.11</spring-boot-3.version>
+    <spring-boot-3.version>3.5.12</spring-boot-3.version>
 
     <!-- protobuf-java_version should be same as protobuf-java_version at dubbo-dependencies-bom -->
     <protobuf-java_version>4.33.4</protobuf-java_version>

From bfd9c60d38bd8462e00cddb90a3f67dd89fc80dd Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Fri, 27 Mar 2026 13:01:37 +0800
Subject: [PATCH 2/2] Update Spring Boot and Spring Security versions

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b3f8b3cabb..4c12a7b7a90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,13 +165,8 @@
 
     <!-- For unify spring boot 3 version -->
     <spring-6.version>6.2.17</spring-6.version>
-<<<<<<< dependabot/maven/org.springframework.boot-spring-boot-starter-actuator-3.5.12
-    <spring-security-6.version>6.5.8</spring-security-6.version>
-    <spring-boot-3.version>3.5.12</spring-boot-3.version>
-=======
     <spring-security-6.version>6.5.9</spring-security-6.version>
-    <spring-boot-3.version>3.5.11</spring-boot-3.version>
->>>>>>> 3.3
+    <spring-boot-3.version>3.5.12</spring-boot-3.version>
 
     <!-- protobuf-java_version should be same as protobuf-java_version at dubbo-dependencies-bom -->
     <protobuf-java_version>4.33.4</protobuf-java_version>