diff --git a/MODULE.bazel b/MODULE.bazel
index 91728b2e60..5ae2551042 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -70,12 +70,12 @@ maven.install(
         "com.squareup.okio:okio-jvm:3.16.4",
         "com.flipkart.zjsonpatch:zjsonpatch:0.4.16",
         # ---- spring (Java 17+ modules) ----
-        "org.springframework:spring-core:6.2.8",
-        "org.springframework:spring-aop:6.2.8",
-        "org.springframework:spring-beans:6.2.8",
-        "org.springframework:spring-context:6.2.8",
-        "org.springframework:spring-expression:6.2.8",
-        "org.springframework:spring-test:6.2.8",
+        "org.springframework:spring-core:7.0.7",
+        "org.springframework:spring-aop:7.0.7",
+        "org.springframework:spring-beans:7.0.7",
+        "org.springframework:spring-context:7.0.7",
+        "org.springframework:spring-expression:7.0.7",
+        "org.springframework:spring-test:7.0.7",
         # ---- test ----
         "ch.qos.logback:logback-classic:1.5.32",
         "ch.qos.logback:logback-core:1.5.32",
@@ -103,7 +103,7 @@ maven.install(
 )
 
 # Spring Boot 4.0.6 artifacts declared with exclusions to keep
-# spring-framework pinned to 6.2.8.
+# spring-framework pinned to 7.0.7.
 _SPRING_FRAMEWORK_EXCLUSIONS = [
     "org.springframework:spring-core",
     "org.springframework:spring-aop",
diff --git a/maven_install.json b/maven_install.json
index 942fc656a4..7a2afb3b68 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -830336295,
-  "__RESOLVED_ARTIFACTS_HASH": -198780269,
+  "__INPUT_ARTIFACTS_HASH": -1002284077,
+  "__RESOLVED_ARTIFACTS_HASH": -852122369,
   "conflict_resolution": {
     "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.14.0",
     "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.48.0",
@@ -42,15 +42,15 @@
     },
     "com.fasterxml.jackson.core:jackson-core": {
       "shasums": {
-        "jar": "12e8655b100267b44d0f14d01b1f5082a5105e616174dc4307be1a761e92407b"
+        "jar": "baf8b739e9d9b93bcdb33f25046bfdb8dbd74c97de2a8698539fbe0c7eeac0bb"
       },
-      "version": "2.21.2"
+      "version": "2.21.3"
     },
     "com.fasterxml.jackson.core:jackson-databind": {
       "shasums": {
-        "jar": "8c982f01f148d805f0aaac2339011244757e0df7c6ff8951f2fa3f433b8ed849"
+        "jar": "f397563d8e67630c10cab8c2334ca0e55af832fa3ebde160a379c2c96d43bf25"
       },
-      "version": "2.21.2"
+      "version": "2.21.3"
     },
     "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml": {
       "shasums": {
@@ -90,21 +90,21 @@
     },
     "com.google.api:api-common": {
       "shasums": {
-        "jar": "f7073fb389c2aa329981ee65241db7947e8744c988e6c4d975f18bf2748b935a"
+        "jar": "c9f5d12e09d341437837d4a0451badb7109ccf64a2fe3e8fb81bf9365cf243a9"
       },
-      "version": "2.53.0"
+      "version": "2.63.0"
     },
     "com.google.auth:google-auth-library-credentials": {
       "shasums": {
-        "jar": "6364caa01ce016378dadf81f2501866d065a5840763821644e1405baaa8d929e"
+        "jar": "7c6abcbd96b51f70e4d59044dea6cce873a527caab8d08d39a0da3f4f585aa9f"
       },
-      "version": "1.46.0"
+      "version": "1.47.0"
     },
     "com.google.auth:google-auth-library-oauth2-http": {
       "shasums": {
-        "jar": "f9d24c965bc08d27ada083fdccb62b956cd19f852fc2b3520af863bbdfc8999c"
+        "jar": "9d0204083441942df12c7294ef4df1fff5ede784a652c138b6c9501790406e9e"
       },
-      "version": "1.46.0"
+      "version": "1.47.0"
     },
     "com.google.auto.value:auto-value-annotations": {
       "shasums": {
@@ -246,9 +246,9 @@
     },
     "commons-logging:commons-logging": {
       "shasums": {
-        "jar": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636"
+        "jar": "6d7a744e4027649fbb50895df9497d109f98c766a637062fe8d2eabbb3140ba4"
       },
-      "version": "1.2"
+      "version": "1.3.5"
     },
     "io.grpc:grpc-api": {
       "shasums": {
@@ -270,75 +270,75 @@
     },
     "io.micrometer:micrometer-commons": {
       "shasums": {
-        "jar": "83408660d54149650da3658fa65b055158115ac91c900b3812022e1a24a35483"
+        "jar": "b0cc8c620453ef71e22d6c4ec5c496cc112f964b4e826b9f87182fc97512c8f9"
       },
-      "version": "1.14.12"
+      "version": "1.16.5"
     },
     "io.micrometer:micrometer-observation": {
       "shasums": {
-        "jar": "430be17d568533f3bb4234d1a7ab3018509967c582c2212770e81bcf933a99b8"
+        "jar": "4406f33535185ff896375e9a81a4b8694e28bf20c1089b24de0325d87f63dfe7"
       },
-      "version": "1.14.12"
+      "version": "1.16.5"
     },
     "io.netty:netty-buffer": {
       "shasums": {
-        "jar": "583c16c0b1e7692eb6cf2ac05bedb5fd8244998306899576d3fb585f4e41d547"
+        "jar": "386d560b5eb8fa5317190c67be1b657e33163eeecd0b25ab36a15bdf235ff204"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-codec": {
       "shasums": {
-        "jar": "10662499b0b6a6435de3a02979eed82b529ea9eaf7f1a54859ecc43705aa4096"
+        "jar": "65d9fd0b5ae80ddda532b3a98bf5adbd4f34ec6ae19ba2439eab2ed3d6d79c5a"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-codec-http": {
       "shasums": {
-        "jar": "77ecb1f5719c9fe26f990d867788e3f47c092377ca4de4fdcee6186e70224cd3"
+        "jar": "cb82f9fd12d9cd3c3bf2306080e2230a29fcddaab388fc8a36bd7b2c7e1e49ec"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-codec-http2": {
       "shasums": {
-        "jar": "8ad7fb7d42f524b11ab1dfbf949269b0d7fe708631da7b5bce8c166ae40a5382"
+        "jar": "0e07715264db137a41b75aa3733b7bb5ab597403abb9668385ea776692ee41d0"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-common": {
       "shasums": {
-        "jar": "97ca3b4e99fc605b6824498387102392f4c6ba9d5d3d93d507e2c9f38ab5bf10"
+        "jar": "799930f8e36ea3611f90372f1ed54c212aee8ae70bf38bdf082417d6db672b0a"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-handler": {
       "shasums": {
-        "jar": "6e19fe8c1a163857ef9eba9e255e133859d1b9da8fe3c7ee799381465e75cc92"
+        "jar": "b468863c1b0fd13ba20f8b1a2b04f8f23d3d6bb50ee3003d372fd8ec7eb87265"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-resolver": {
       "shasums": {
-        "jar": "1f0245b4541357aad24be113c870db0a08c75895eaa650338783397c245fa4c2"
+        "jar": "8b9ee3129bd6f8d0b5b09007b4e41e78c6ea63f18a8d33cb171455ffabcda10e"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-transport": {
       "shasums": {
-        "jar": "70da7db7fba9bfcbed030747ca25e9a6a3a53694c3c69b353c4851e9db08f60a"
+        "jar": "9895abfebf5cb8c185e4534f3936759d7ecd133353cef18d2ae9ae3c58845142"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-transport-classes-epoll": {
       "shasums": {
-        "jar": "fbadf92d6c00f5d6d8e8835ae5256260e376c0f021c0d4656ad680e26cdb2e35"
+        "jar": "d21448bca3a3691437e88e974f24a36270783a62a79eff3a615fb6f730d6714b"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.netty:netty-transport-native-unix-common": {
       "shasums": {
-        "jar": "542d554e9bb57b57282cb42db7e05d2128d402d32584e5600daa2aef9d1980d1"
+        "jar": "75681c3be01ff3c5bb6a39a7583e70289f64fd926e4fc29859ce9cf223ad99fc"
       },
-      "version": "4.1.132.Final"
+      "version": "4.1.133.Final"
     },
     "io.opencensus:opencensus-api": {
       "shasums": {
@@ -798,9 +798,9 @@
     },
     "org.slf4j:slf4j-api": {
       "shasums": {
-        "jar": "7b751d952061954d5abfed7181c1f645d336091b679891591d63329c622eb832"
+        "jar": "44508fd1576500688c790b190acdd16fec4f8c79a3e0b900afd70503cf055f55"
       },
-      "version": "2.0.17"
+      "version": "2.0.18"
     },
     "org.springframework.boot:spring-boot": {
       "shasums": {
@@ -828,45 +828,39 @@
     },
     "org.springframework:spring-aop": {
       "shasums": {
-        "jar": "befc1dc092de62dab3aae3c7a0e11f797c6060fffc2121e1fe8fb95c94272655"
+        "jar": "c0503b7f318368f37f0d0e0557f65e572cebdf61cf9c318a7cbcad7824b0f284"
       },
-      "version": "6.2.12"
+      "version": "7.0.7"
     },
     "org.springframework:spring-beans": {
       "shasums": {
-        "jar": "26ab8ce28a42fe951b0a4ebaf8dbe97478effca833a7b2f51b45d6540fe7179f"
+        "jar": "13775be4269a6cc82ebcee619a9fef1545c90ae54c6fba84a0d8c6d79ff6877a"
       },
-      "version": "6.2.12"
+      "version": "7.0.7"
     },
     "org.springframework:spring-context": {
       "shasums": {
-        "jar": "0439fb9cb09a8b8d04c4e37dcba592e489b690882c56940aa33b58cf3f0b69cb"
+        "jar": "4a252050fd8595c5922c4d795728f8aae495e41171b3a958b0cee349b5e3586b"
       },
-      "version": "6.2.12"
+      "version": "7.0.7"
     },
     "org.springframework:spring-core": {
       "shasums": {
-        "jar": "bddc5a5be2d94191ebcfbadc672fa4d81e6ab51e38a9eaf41d5d035cb17548d4"
+        "jar": "9e1c13ed6d69002aae7ebc4b7d2d1d07e309013a2fbb63ab266bea8601229785"
       },
-      "version": "6.2.12"
+      "version": "7.0.7"
     },
     "org.springframework:spring-expression": {
       "shasums": {
-        "jar": "62e68f4f18b8c5580180de6ef8578b1d1fc170ed993b5a7d59b946b63e5ebefd"
+        "jar": "3c23d7eb62bb3fbddc0ad1d7f94be94d1518424f1c9a1b4de6b1b6906e8d0c54"
       },
-      "version": "6.2.12"
-    },
-    "org.springframework:spring-jcl": {
-      "shasums": {
-        "jar": "8244ee2a515291f41ed4f99aa89b4cd41fc13961c21d7c271a381210f6075fed"
-      },
-      "version": "6.2.12"
+      "version": "7.0.7"
     },
     "org.springframework:spring-test": {
       "shasums": {
-        "jar": "a6df3df3f47d87555e7c9867e0697dcf5bc243e829d97efe946afde90ac74f9f"
+        "jar": "9ed5fda6520b79f1f53714b2f307891a19c5fc18181169fe81d5272efd73a934"
       },
-      "version": "6.2.12"
+      "version": "7.0.7"
     },
     "org.wiremock:wiremock": {
       "shasums": {
@@ -900,165 +894,165 @@
     },
     "software.amazon.awssdk:annotations": {
       "shasums": {
-        "jar": "96063dcdd121718a6c271c39eac70038af88f94dc2a70c5454cd1e02153b47cb"
+        "jar": "7162bfc576d9188e0a3d918febcbe91ffd47f6f02e8c17c0d3f27d4f7c536ba0"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:apache-client": {
       "shasums": {
-        "jar": "80456e2c7dd292e2a249669a611d8f78333b64ddb18c4f5ea61f8fb7966ae9e1"
+        "jar": "3ef2c482aafcccfa437fb051805d1ab2650156350a7f6450e389015621cc2b46"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:auth": {
       "shasums": {
-        "jar": "7b84c42f9dad289f83a59f1136267f51af40dffdd49802c2c18aef3d0ccc975e"
+        "jar": "db6b66a5423b9fa9ae4458183751a39115c8d5e49b7d5453f1c7de101b6ad36f"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:aws-core": {
       "shasums": {
-        "jar": "6f6a994b1efef9dbb926033f691c893e327de750dae4abd0fb323063299f6c87"
+        "jar": "c9c934fe5bc756e97894ec7e41f33180db7c892a03f27473cabe1c886614c13b"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:aws-query-protocol": {
       "shasums": {
-        "jar": "f1327178e6d8c567411cd19b1c0e3b5f22d69a32a70c6dbdafdb483c2f83188b"
+        "jar": "1ab120d8cc40fa8d59a8aa143bb7af7e70a5cad0b7cc6033a5d1727e442b5b1c"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:checksums": {
       "shasums": {
-        "jar": "6e181c5e7310b7b4235e5950eea09187cdeda473934f14df624342074ccd8c71"
+        "jar": "69e9d1f3598a9877fdf07adb8118435103f414b6247df7448d3b3dc84ea77987"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:checksums-spi": {
       "shasums": {
-        "jar": "dd0de82d40f2c41e492f674f45763c286bc2b3b964798fe72acad27bab9cc679"
+        "jar": "a279dbe4e7bf21c0fb8aa5ec3ce9187cf2eb659bcbe32c0fcc0c3cc281f91412"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:endpoints-spi": {
       "shasums": {
-        "jar": "6559cf0d8a5383d397b2e6b7578638c33640efabe41c3c9a30bb371e814d1f85"
+        "jar": "3c5264ae6c7c9ec6d52f9dd37a328d53f5fbc7e7e5cd71a2b131f9e408167b0d"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:http-auth": {
       "shasums": {
-        "jar": "436b54f48de75a73bf42a97b5ef4482fb219d570b352f1fe417d0b6640416c94"
+        "jar": "34f4d9e17abb1b7ffe48a6c643ac2726b811f3d3f1fc51154c987d61a124d502"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:http-auth-aws": {
       "shasums": {
-        "jar": "c8c11547434cceea39f3ff3c695999c9511c61f874d2354676ce217c63fcd9da"
+        "jar": "0b8e63e1cde439e8d83f709f66cb7ae750a88cdb8291ab7222cdba34b96d8c8c"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:http-auth-aws-eventstream": {
       "shasums": {
-        "jar": "acbce215a45f341dc583c4d6132b935cb5afa217f7dd5cc18e9b2353ae845f7e"
+        "jar": "bb2354de7aca461f6142b6f43eaf4de208628f330592e51bb3039fe3f3cf8866"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:http-auth-spi": {
       "shasums": {
-        "jar": "10d6d5e8a26ebe048fc47c0cfa37e757ed88e05b0af09038c99ab6325d237618"
+        "jar": "6c02c21e8a23cfc907da4be1496a69ce7f8284e04628bc49cb83693a8f2fb1ae"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:http-client-spi": {
       "shasums": {
-        "jar": "d84ef6784ddb64c9820260ceffba2cc047ef24ed16976512fe047c20c26bbdca"
+        "jar": "e33887bc80b2df33cc4ce6b6b903c60a54e6e2c11bfc5524068a4148ed8d49ec"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:identity-spi": {
       "shasums": {
-        "jar": "5a1948ae99e100ee98c14c85a06ea8c32bf72a3fb02954704c0aa47e828cb54a"
+        "jar": "76410ae09e52dc2207a45f8c198d6bf283feabd5610ac149c91af51a55e67cc9"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:json-utils": {
       "shasums": {
-        "jar": "fbab2c42d9a2e9c6560ecf5429b28a59569ab3d59293b2888f2defa513a12ef4"
+        "jar": "4f6190c5d3946265474beef5d9dfa065e986932534a40a8a4599c9118ac0968f"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:metrics-spi": {
       "shasums": {
-        "jar": "09d758f6cc112eb89956dbbc50fb501f535967b32db977b600f26d8ed257e56d"
+        "jar": "cb601625c65437c26d3066a2fc209a08e27fad701e1cdf519a052ba6b58719e7"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:netty-nio-client": {
       "shasums": {
-        "jar": "d704a2b299c03cf6801ad62292522dd31a5de1763ad29f7057f75e5981ad5813"
+        "jar": "bbb42f07f4e167ec281e552a253e13c3e644f77750e5ce83da68c7e126537486"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:profiles": {
       "shasums": {
-        "jar": "f5e068ab30a41d0583d377c90fd0fe7759bcf0bbab9931bdaa8c8fe26bd2a8bf"
+        "jar": "6e2122ab7d24f8b7d4eb3e681f8b6336c2152e8c2b290e3c1e5c21b6c6712b94"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:protocol-core": {
       "shasums": {
-        "jar": "321d02d28690dc8adea98cd67066f4fb4cd63593e5d4f379f9256a59693b8dd2"
+        "jar": "d25774307c285db81605b936e5d633198b28a9b2a35784bc19d9067592ffc8d2"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:regions": {
       "shasums": {
-        "jar": "6819126b90ec786cb9267a03b6c098d9da5bb635e4df1e98c11059505046db77"
+        "jar": "efa99f0b90d4b759bba464f5c3d08eb951382326357a4da0c4ea5330e68687ec"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:retries": {
       "shasums": {
-        "jar": "f393a4f71ef40ce6b3573f5aaa9064ad5142bea906028a0069d25e4e2c8d3c67"
+        "jar": "431b00991c94a2fcbc481902167652050116087062f932bd3d6dce0f818e26db"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:retries-spi": {
       "shasums": {
-        "jar": "8045ae8466353dafbd83f1fe2380aa7f72a1ba6ba95c5999e6a5bafdc244b1d7"
+        "jar": "aa89c4c5cf814526a05ab754ca09bbad432c5fd762d6a1ba60116152c761de1c"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:sdk-core": {
       "shasums": {
-        "jar": "9880a2c2e2e51983629e0d99e46fe30ed95c897bcd3d394e2f7235e799213e1f"
+        "jar": "90f1d69ab5335cab766653a9b65800c69fd80642ac4ffa9131621ed21ed3f783"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:sts": {
       "shasums": {
-        "jar": "1d9c52950dc719357353d37959a2192fcedff91e35da9bb2b85a8e6d1fd1b948"
+        "jar": "e3c4864f26b8fca79fc412b786b75faedb1239d306dced43a869b45c4176c372"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:third-party-jackson-core": {
       "shasums": {
-        "jar": "8e9c077f91888b971aa3d50dbebb1538447f3276e91505d1f1cbed73404bb4a9"
+        "jar": "0f29308e9bce00cbac2713e7b216804ef84ea789cc5aa3ee62f63b59ccc10ea4"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:utils": {
       "shasums": {
-        "jar": "c3a10a6a8a2d85f2e6f1f85d60403cf747b7828daf3ab7f78e313d35427a0683"
+        "jar": "ee4413ce8bc37e9c5cfd199a8127f3ae58553a9f2add186e7b5d5bcc668cf242"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.awssdk:utils-lite": {
       "shasums": {
-        "jar": "ffe1d8c4f6fdb0de8329b5e86ed7b29a24a158027c51b1ceb46cce02e8f42f95"
+        "jar": "ea82c4d8752fd1f057782e6213e9dba83fdae2751c07e2890418bbacf9a0a99f"
       },
-      "version": "2.43.0"
+      "version": "2.44.8"
     },
     "software.amazon.eventstream:eventstream": {
       "shasums": {
@@ -1118,7 +1112,6 @@
       "com.google.code.findbugs:jsr305",
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
-      "com.google.j2objc:j2objc-annotations",
       "javax.annotation:javax.annotation-api"
     ],
     "com.google.auth:google-auth-library-oauth2-http": [
@@ -1210,8 +1203,12 @@
     "io.gsonfire:gson-fire": [
       "com.google.code.gson:gson"
     ],
+    "io.micrometer:micrometer-commons": [
+      "org.jspecify:jspecify"
+    ],
     "io.micrometer:micrometer-observation": [
-      "io.micrometer:micrometer-commons"
+      "io.micrometer:micrometer-commons",
+      "org.jspecify:jspecify"
     ],
     "io.netty:netty-buffer": [
       "io.netty:netty-common"
@@ -1494,7 +1491,8 @@
       "org.springframework:spring-expression"
     ],
     "org.springframework:spring-core": [
-      "org.springframework:spring-jcl"
+      "commons-logging:commons-logging",
+      "org.jspecify:jspecify"
     ],
     "org.springframework:spring-expression": [
       "org.springframework:spring-core"
@@ -1860,9 +1858,9 @@
       "com.fasterxml.jackson.core.exc",
       "com.fasterxml.jackson.core.filter",
       "com.fasterxml.jackson.core.format",
-      "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_2",
-      "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_2.bte",
-      "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_2.chr",
+      "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_3",
+      "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_3.bte",
+      "com.fasterxml.jackson.core.internal.shaded.fdp.v2_21_3.chr",
       "com.fasterxml.jackson.core.io",
       "com.fasterxml.jackson.core.io.schubfach",
       "com.fasterxml.jackson.core.json",
@@ -2170,6 +2168,7 @@
       "io.micrometer.common.annotation",
       "io.micrometer.common.docs",
       "io.micrometer.common.lang",
+      "io.micrometer.common.lang.internal",
       "io.micrometer.common.util",
       "io.micrometer.common.util.internal.logging"
     ],
@@ -3522,6 +3521,7 @@
       "org.springframework.boot.test.web.server"
     ],
     "org.springframework:spring-aop": [
+      "org.aopalliance",
       "org.aopalliance.aop",
       "org.aopalliance.intercept",
       "org.springframework.aop",
@@ -3595,6 +3595,9 @@
       "org.springframework.jmx.support",
       "org.springframework.jndi",
       "org.springframework.jndi.support",
+      "org.springframework.resilience",
+      "org.springframework.resilience.annotation",
+      "org.springframework.resilience.retry",
       "org.springframework.scheduling",
       "org.springframework.scheduling.annotation",
       "org.springframework.scheduling.concurrent",
@@ -3607,8 +3610,6 @@
       "org.springframework.scripting.support",
       "org.springframework.stereotype",
       "org.springframework.ui",
-      "org.springframework.ui.context",
-      "org.springframework.ui.context.support",
       "org.springframework.validation",
       "org.springframework.validation.annotation",
       "org.springframework.validation.beanvalidation",
@@ -3624,7 +3625,6 @@
       "org.springframework.aot.hint.support",
       "org.springframework.aot.nativex",
       "org.springframework.aot.nativex.feature",
-      "org.springframework.aot.nativex.substitution",
       "org.springframework.asm",
       "org.springframework.cglib",
       "org.springframework.cglib.beans",
@@ -3648,6 +3648,8 @@
       "org.springframework.core.log",
       "org.springframework.core.metrics",
       "org.springframework.core.metrics.jfr",
+      "org.springframework.core.retry",
+      "org.springframework.core.retry.support",
       "org.springframework.core.serializer",
       "org.springframework.core.serializer.support",
       "org.springframework.core.style",
@@ -3684,10 +3686,6 @@
       "org.springframework.expression.spel.standard",
       "org.springframework.expression.spel.support"
     ],
-    "org.springframework:spring-jcl": [
-      "org.apache.commons.logging",
-      "org.apache.commons.logging.impl"
-    ],
     "org.springframework:spring-test": [
       "org.springframework.mock.env",
       "org.springframework.mock.http",
@@ -3730,14 +3728,17 @@
       "org.springframework.test.web.client.match",
       "org.springframework.test.web.client.response",
       "org.springframework.test.web.reactive.server",
+      "org.springframework.test.web.reactive.server.assertj",
       "org.springframework.test.web.servlet",
       "org.springframework.test.web.servlet.assertj",
       "org.springframework.test.web.servlet.client",
+      "org.springframework.test.web.servlet.client.assertj",
       "org.springframework.test.web.servlet.htmlunit",
       "org.springframework.test.web.servlet.htmlunit.webdriver",
       "org.springframework.test.web.servlet.request",
       "org.springframework.test.web.servlet.result",
-      "org.springframework.test.web.servlet.setup"
+      "org.springframework.test.web.servlet.setup",
+      "org.springframework.test.web.support"
     ],
     "org.wiremock:wiremock": [
       "com.github.tomakehurst.wiremock",
@@ -4054,9 +4055,9 @@
       "software.amazon.awssdk.thirdparty.jackson.core.exc",
       "software.amazon.awssdk.thirdparty.jackson.core.filter",
       "software.amazon.awssdk.thirdparty.jackson.core.format",
-      "software.amazon.awssdk.thirdparty.jackson.core.internal.shaded.fdp.v2_20_2",
-      "software.amazon.awssdk.thirdparty.jackson.core.internal.shaded.fdp.v2_20_2.bte",
-      "software.amazon.awssdk.thirdparty.jackson.core.internal.shaded.fdp.v2_20_2.chr",
+      "software.amazon.awssdk.thirdparty.jackson.core.internal.shaded.fdp.v2_21_3",
+      "software.amazon.awssdk.thirdparty.jackson.core.internal.shaded.fdp.v2_21_3.bte",
+      "software.amazon.awssdk.thirdparty.jackson.core.internal.shaded.fdp.v2_21_3.chr",
       "software.amazon.awssdk.thirdparty.jackson.core.io",
       "software.amazon.awssdk.thirdparty.jackson.core.io.schubfach",
       "software.amazon.awssdk.thirdparty.jackson.core.json",
@@ -4244,7 +4245,6 @@
       "org.springframework:spring-context",
       "org.springframework:spring-core",
       "org.springframework:spring-expression",
-      "org.springframework:spring-jcl",
       "org.springframework:spring-test",
       "org.wiremock:wiremock",
       "org.xmlunit:xmlunit-core",
@@ -4424,7 +4424,6 @@
       "org.springframework:spring-context",
       "org.springframework:spring-core",
       "org.springframework:spring-expression",
-      "org.springframework:spring-jcl",
       "org.springframework:spring-test",
       "org.wiremock:wiremock",
       "org.xmlunit:xmlunit-core",
@@ -4595,11 +4594,6 @@
         "org.springframework.core.ReactiveAdapterRegistry$SpringCoreBlockHoundIntegration"
       ]
     },
-    "org.springframework:spring-jcl": {
-      "org.apache.commons.logging.LogFactory": [
-        "org.apache.commons.logging.LogFactoryService"
-      ]
-    },
     "org.wiremock:wiremock": {
       "wiremock.org.slf4j.spi.SLF4JServiceProvider": [
         "wiremock.org.slf4j.helpers.NOP_FallbackServiceProvider"
diff --git a/pom.xml b/pom.xml
index 9eb97e24cb..a23c90ae88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
     <apache.commons.io>2.22.0</apache.commons.io>
     <common.codec.version>1.22.0</common.codec.version>
     <spring.boot.version>4.0.6</spring.boot.version>
-    <spring.version>6.2.8</spring.version>
+    <spring.version>7.0.7</spring.version>
     <prometheus.client.version>0.16.0</prometheus.client.version>
     <reflections.version>0.10.2</reflections.version>
     <aws.sdk.version>2.44.8</aws.sdk.version>