From d6adbfa36e691666e67596a1466777f911fdecf9 Mon Sep 17 00:00:00 2001
From: PIGCLOUD <wangiegie@gmail.com>
Date: Mon, 2 Nov 2026 21:49:49 +0800
Subject: [PATCH] fix(build): upgrade Maven Surefire to 3.6.1

(cherry picked from commit 54dc3b330c245fc79428e4e216b66e405bd47e3f)
---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9da3eed22..dd6debacc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
         <spring-boot-admin.version>4.1.2</spring-boot-admin.version>
         <maven.compiler.version>3.14.1</maven.compiler.version>
         <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
+        <maven-surefire-plugin.version>3.6.1</maven-surefire-plugin.version>
         <spring.checkstyle.version>0.0.47</spring.checkstyle.version>
         <git.commit.version>10.0.1</git.commit.version>
         <cas.sdk.version>3.6.4</cas.sdk.version>
@@ -192,6 +193,12 @@
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>${maven-deploy-plugin.version}</version>
                 </plugin>
+                <!--固定 surefire 版本：3.6.0 在 TCCL 为 null 时 NPE（SUREFIRE-3460），会打断 JDK 25 下 Mockito 动态加载 agent-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
                 <!--spring boot 默认插件-->
                 <plugin>
                     <groupId>org.springframework.boot</groupId>