From b3be902648b2a5b1c1cda1677913fc7c959a0d6a Mon Sep 17 00:00:00 2001
From: Ling Bao <xia.erich03@gmail.com>
Date: Wed, 3 Jun 2026 11:48:35 +1000
Subject: [PATCH 1/2] Canonicalize central CI caller shape

---
 .github/workflows/maven-ci.yml | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index 889d006..b903cdb 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.github/workflows/maven-ci.yml
@@ -1,31 +1,13 @@
 name: Maven CI
-
 on:
   push:
-    branches:
-      - '**'
+    branches: ['**']
   pull_request:
-
 permissions:
   contents: read
-
 jobs:
-  verify:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: '8'
-          cache: maven
-
-      - name: Run tests
-        run: mvn -B test
-
-      - name: Build package
-        run: mvn -B package
+  ci:
+    # Pin to the floating major tag @v1 to auto-receive security re-pins; immutable tags (e.g. v1.1.0) remain available for strict pinning.
+    uses: UltiKits/ci-workflows/.github/workflows/maven-ci.yml@v1
+    with:
+      needs-nms: false

From d3c1180dacfce7e860c28bc3e5fc49529a85b5a6 Mon Sep 17 00:00:00 2001
From: Ling Bao <xia.erich03@gmail.com>
Date: Wed, 3 Jun 2026 18:59:08 +1000
Subject: [PATCH 2/2] test: update Mockito runtime for JDK 21

---
 pom.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index af34987..bb9e8ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,19 +77,31 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.11.0</version>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>4.11.0</version>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>4.11.0</version>
+            <version>5.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>1.15.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-agent</artifactId>
+            <version>1.15.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>