From c1c750a03e47baca2b5c2112c2944aa498ac7050 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 19:28:26 +0000
Subject: [PATCH 1/6] Initial plan


From e21444b9dfeb294c9fb415253f9516f48b361c36 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 19:34:11 +0000
Subject: [PATCH 2/6] Update JUnit Jupiter to 6.0.2 for Spring 7.0.3
 compatibility

Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com>
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe095cf06f..8e7e3c0bad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,8 +48,7 @@
     <slf4j.version>2.0.17</slf4j.version>
     <caffeine.version>2.9.3</caffeine.version>
     <protobuf.version>4.33.4</protobuf.version>
-    <junit-jupiter.version>5.13.4</junit-jupiter.version>
-    <junit-jupiter.version>5.13.4</junit-jupiter.version>
+    <junit-jupiter.version>6.0.2</junit-jupiter.version>
     <junit-jupiter-params.version>${junit-jupiter.version}</junit-jupiter-params.version>
     <bucket4j.version>8.10.1</bucket4j.version>
     <bouncycastle.version>1.83</bouncycastle.version>

From 275b88783bd799b1d927d40e71e8c22605f693f7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 19:37:34 +0000
Subject: [PATCH 3/6] Exclude JUnit Jupiter API from Mockito to prevent version
 conflict

Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com>
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8e7e3c0bad..f539db11e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,12 @@
         <artifactId>mockito-junit-jupiter</artifactId>
         <version>5.21.0</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>uk.org.webcompere</groupId>

From 84225349282986733f204f58b4ca67fa051921da Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 21:28:09 +0000
Subject: [PATCH 4/6] Add comment noting Spring Framework 7.0.3 update

Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com>
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index f539db11e9..c5819988d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,8 @@
     <prometheus.client.version>0.16.0</prometheus.client.version>
     <reflections.version>0.10.2</reflections.version>
 
+    <!-- Updated Spring Framework from 6.2.12 to 7.0.3 -->
+
     <!-- The `optional` tag in `dependencyManagement` is not inherited; see
     https://issues.apache.org/jira/browse/MNG-5227 and
     https://issues.apache.org/jira/browse/MNG-5632. Therefore, we specify

From f24a33b6794147280dee4ca7dd60a33a8f273e2e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 22:34:05 +0000
Subject: [PATCH 5/6] Revert Spring version to 6.2.12 to prepare for clean
 cherry-pick

Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c5819988d8..1a861a4ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
     <apache.commons.io>2.21.0</apache.commons.io>
     <common.codec.version>1.20.0</common.codec.version>
     <spring.boot.version>4.0.1</spring.boot.version>
-    <spring.version>7.0.3</spring.version>
+    <spring.version>6.2.12</spring.version>
     <prometheus.client.version>0.16.0</prometheus.client.version>
     <reflections.version>0.10.2</reflections.version>
 

From e64bbbf1be0df5516ac6c398f73ba0cb441ad5d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 02:02:44 +0000
Subject: [PATCH 6/6] build(deps): bump spring.version from 6.2.12 to 7.0.3

Bumps `spring.version` from 6.2.12 to 7.0.3.

Updates `org.springframework:spring-core` from 6.2.12 to 7.0.3
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.12...v7.0.3)

Updates `org.springframework:spring-context` from 6.2.12 to 7.0.3
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.12...v7.0.3)

Updates `org.springframework:spring-test` from 6.2.12 to 7.0.3
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.12...v7.0.3)

---
updated-dependencies:
- dependency-name: org.springframework:spring-core
  dependency-version: 7.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.springframework:spring-context
  dependency-version: 7.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.springframework:spring-test
  dependency-version: 7.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

diff --git a/pom.xml b/pom.xml
index 1a861a4ac5..f539db11e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,12 +65,10 @@
     <apache.commons.io>2.21.0</apache.commons.io>
     <common.codec.version>1.20.0</common.codec.version>
     <spring.boot.version>4.0.1</spring.boot.version>
-    <spring.version>6.2.12</spring.version>
+    <spring.version>7.0.3</spring.version>
     <prometheus.client.version>0.16.0</prometheus.client.version>
     <reflections.version>0.10.2</reflections.version>
 
-    <!-- Updated Spring Framework from 6.2.12 to 7.0.3 -->
-
     <!-- The `optional` tag in `dependencyManagement` is not inherited; see
     https://issues.apache.org/jira/browse/MNG-5227 and
     https://issues.apache.org/jira/browse/MNG-5632. Therefore, we specify