diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 180ef9e3..05b8668f 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.0.0"
+  ".": "7.0.1"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d3b0be..5d54395c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@
 
 * making Annotations.fieldsAnAnnotations respect inheritance ([3b266dd](https://github.com/mxenabled/path-core/commit/3b266ddcb227766a32f16e88e7b9b2022737de53))
 
+## [7.0.1](https://github.com/mxenabled/path-core/compare/v7.0.0...v7.0.1) (2026-06-01)
+
+
+### Bug Fixes
+
+* trigger re-release after vogue hotfix ([3c0dc3f](https://github.com/mxenabled/path-core/commit/3c0dc3f913dbacb7e3477666e2d6e585dfe45696))
+
 ## [7.0.0](https://github.com/mxenabled/path-core/compare/v6.0.4...v7.0.0) (2026-06-01)
 
 
diff --git a/README.md b/README.md
index dcfbc7da..8fa9b0d9 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ _Gradle_
 <!-- x-release-please-start-version -->
 ```groovy
 dependencies {
-  api platform("com.mx.path-core:platform:7.0.0")
+  api platform("com.mx.path-core:platform:7.0.1")
 
   implementation "com.mx.path-core:common"
   implementation "com.mx.path-core:context"
@@ -45,16 +45,16 @@ _Gradle_
 <!-- x-release-please-start-version -->
 ```groovy
 dependencies {
-  implementation "com.mx.path-core:common:7.0.0"
-  implementation "com.mx.path-core:context:7.0.0"
-  implementation "com.mx.path-core:gateway:7.0.0"
-  implementation "com.mx.path-core:http:7.0.0"
-  implementation "com.mx.path-core:messaging:7.0.0"
-  implementation "com.mx.path-core:utilities:7.0.0"
+  implementation "com.mx.path-core:common:7.0.1"
+  implementation "com.mx.path-core:context:7.0.1"
+  implementation "com.mx.path-core:gateway:7.0.1"
+  implementation "com.mx.path-core:http:7.0.1"
+  implementation "com.mx.path-core:messaging:7.0.1"
+  implementation "com.mx.path-core:utilities:7.0.1"
 
-  annotationProcessor "com.mx.path-core:gateway-generator:7.0.0"
+  annotationProcessor "com.mx.path-core:gateway-generator:7.0.1"
 
-  testImplementation "com.mx.path-core:testing:7.0.0"
+  testImplementation "com.mx.path-core:testing:7.0.1"
 }
 ```
 <!-- x-release-please-end -->
diff --git a/build.gradle b/build.gradle
index 46d13851..79217642 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,9 @@
 plugins {
-  id "com.github.mxenabled.coppuccino" version "7.+" apply false
-  id "com.github.mxenabled.vogue" version "4.+" apply false
+  id "com.github.mxenabled.coppuccino" version "8.+" apply false
+  id "com.github.mxenabled.vogue" version "5.+" apply false
   id "idea"
-  id "io.freefair.lombok" version "8.+" apply false
-  id "io.github.gradle-nexus.publish-plugin" version "1.1.+"
+  id "io.freefair.lombok" version "9.+" apply false
+  id "io.github.gradle-nexus.publish-plugin" version "2.+"
 }
 
 group "com.mx.path-core"
@@ -58,7 +58,7 @@ subprojects {
 
     ext {
       mockitoVersion = "[5.0,6.0)"
-      spockVersion = "2.4-M6-groovy-3.0"
+      spockVersion = "2.4-groovy-4.0"
       junitVersion = "5.14.0"
       openTracingVersion = "[0.33,0.34)"
       slf4jVersion = "1.7.30"
@@ -83,10 +83,9 @@ subprojects {
         // Version changes to any of these need to be tested (not just built)
         //   with an app that uses SOAP.
         // -----------------------------------------------------------------
-        api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4!!"
+        api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5!!"
         api "jakarta.xml.soap:jakarta.xml.soap-api:3.0.2!!"
-        api "com.sun.xml.bind:jaxb-impl:4.0.6!!"
-        api "org.glassfish.jaxb:jaxb-runtime:4.0.6!!"
+        api "org.glassfish.jaxb:jaxb-runtime:[4.0.9,5.0.0)"
 
         // --- Shared Testing Libraries ---
         api "io.opentracing:opentracing-mock:${project.ext.openTracingVersion}"
@@ -102,6 +101,7 @@ subprojects {
       testImplementation "org.mockito:mockito-core:${project.ext.mockitoVersion}"
       testImplementation "org.spockframework:spock-core:${project.ext.spockVersion}"
       testImplementation "org.junit.jupiter:junit-jupiter-api:${project.ext.junitVersion}"
+      testRuntimeOnly "org.junit.platform:junit-platform-launcher"
     }
 
     compileJava { options.compilerArgs << "-parameters" }
@@ -206,6 +206,6 @@ tasks.named("dependencies") {
 }
 
 wrapper {
-  gradleVersion = "8.14.3"
+  gradleVersion = "9.5.1"
   distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/common/gradle.lockfile b/common/gradle.lockfile
index d9d4d443..cc42897d 100644
--- a/common/gradle.lockfile
+++ b/common/gradle.lockfile
@@ -3,26 +3,25 @@
 # This file is expected to be part of source control.
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
-commons-codec:commons-codec:1.15=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 info.picocli:picocli:4.7.7=checkstyle
@@ -30,8 +29,7 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -42,9 +40,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
 org.apache.logging.log4j:log4j-api:2.26.0=spotbugs
@@ -55,50 +52,49 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/context/gradle.lockfile b/context/gradle.lockfile
index 0c40c2b9..327dc6f3 100644
--- a/context/gradle.lockfile
+++ b/context/gradle.lockfile
@@ -8,26 +8,25 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
-commons-codec:commons-codec:1.15=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 info.picocli:picocli:4.7.7=checkstyle
@@ -39,8 +38,7 @@ io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCom
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -51,9 +49,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
 org.apache.logging.log4j:log4j-api:2.26.0=spotbugs
@@ -64,51 +61,50 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.30=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 uk.org.webcompere:system-stubs-core:2.1.5=testCompileClasspath,testRuntimeClasspath
 uk.org.webcompere:system-stubs-jupiter:2.1.5=testCompileClasspath,testRuntimeClasspath
diff --git a/gateway-generator/gradle.lockfile b/gateway-generator/gradle.lockfile
index 208e57ca..a016be0f 100644
--- a/gateway-generator/gradle.lockfile
+++ b/gateway-generator/gradle.lockfile
@@ -9,8 +9,7 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath
@@ -20,24 +19,23 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClas
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.0.1-jre=annotationProcessor,compileClasspath
+com.google.guava:guava:32.1.3-jre=runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
@@ -48,13 +46,12 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp
 io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -65,9 +62,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
@@ -80,54 +76,54 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.33.0=annotationProcessor,compileClasspath
+org.checkerframework:checker-qual:3.37.0=runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/gateway/build.gradle b/gateway/build.gradle
index 2d648d16..249898e8 100644
--- a/gateway/build.gradle
+++ b/gateway/build.gradle
@@ -21,7 +21,6 @@ dependencies {
   api "com.datadoghq:dd-trace-api"
   api "jakarta.xml.bind:jakarta.xml.bind-api"
   api "jakarta.xml.soap:jakarta.xml.soap-api"
-  api "com.sun.xml.bind:jaxb-impl"
   api "org.glassfish.jaxb:jaxb-runtime"
 
   implementation "org.apache.httpcomponents:httpclient"
diff --git a/gateway/gradle.lockfile b/gateway/gradle.lockfile
index c17f0c6e..50e8fa09 100644
--- a/gateway/gradle.lockfile
+++ b/gateway/gradle.lockfile
@@ -9,30 +9,27 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-codec:commons-codec:1.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -44,13 +41,12 @@ io.opentracing:opentracing-mock:0.33.0=testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -61,9 +57,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
@@ -76,45 +71,44 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.32=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -122,9 +116,9 @@ org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1b33c55b..b1b8ef56 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7705927e..e74c8700 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 23d15a93..b9bb139f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index db3a6ac2..24c62d56 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
diff --git a/http/gradle.lockfile b/http/gradle.lockfile
index d07e9b15..5bab057a 100644
--- a/http/gradle.lockfile
+++ b/http/gradle.lockfile
@@ -9,30 +9,27 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.11.0=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-codec:commons-codec:1.11=checkstyle
 commons-codec:commons-codec:1.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -44,13 +41,12 @@ io.opentracing:opentracing-mock:0.33.0=testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -61,9 +57,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
@@ -76,45 +71,44 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.30=compileClasspath,testCompileClasspath
@@ -123,9 +117,9 @@ org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/messaging/gradle.lockfile b/messaging/gradle.lockfile
index c19c1365..cc9e277f 100644
--- a/messaging/gradle.lockfile
+++ b/messaging/gradle.lockfile
@@ -8,26 +8,25 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
-commons-codec:commons-codec:1.15=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 info.picocli:picocli:4.7.7=checkstyle
@@ -40,8 +39,7 @@ io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCom
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -52,9 +50,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
 org.apache.logging.log4j:log4j-api:2.26.0=spotbugs
@@ -65,41 +62,40 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -107,9 +103,9 @@ org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/test-gateway-generator/gradle.lockfile b/test-gateway-generator/gradle.lockfile
index e55743b0..737c1fd0 100644
--- a/test-gateway-generator/gradle.lockfile
+++ b/test-gateway-generator/gradle.lockfile
@@ -8,21 +8,18 @@ com.fasterxml.jackson.core:jackson-core:2.21.3=runtimeClasspath,testRuntimeClass
 com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
 com.squareup:javapoet:1.13.0=runtimeClasspath,testRuntimeClasspath
 com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
@@ -32,7 +29,7 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp
 io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
@@ -41,48 +38,50 @@ net.sf.saxon:Saxon-HE:12.9=spotbugs
 org.apache.bcel:bcel:6.12.0=spotbugs
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.16=runtimeClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-api:2.26.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.26.0=spotbugs
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.ow2.asm:asm:9.9=jacocoAnt
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/test-gateways/gradle.lockfile b/test-gateways/gradle.lockfile
index cd3aba02..3527a27e 100644
--- a/test-gateways/gradle.lockfile
+++ b/test-gateways/gradle.lockfile
@@ -9,31 +9,28 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=annotationProcessor,runtimeCl
 com.fasterxml.jackson:jackson-bom:2.21.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 com.squareup:javapoet:1.13.0=annotationProcessor
 com.sun.istack:istack-commons-runtime:4.1.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-codec:commons-codec:1.14=annotationProcessor,runtimeClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath
@@ -44,13 +41,12 @@ io.opentracing:opentracing-api:0.33.0=annotationProcessor,compileClasspath,runti
 io.opentracing:opentracing-noop:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -61,9 +57,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=annotationProcessor,compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpclient:4.5.14=annotationProcessor,runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
@@ -76,54 +71,53 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.32=annotationProcessor,runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/test-models/gradle.lockfile b/test-models/gradle.lockfile
index 830d6389..c6b45649 100644
--- a/test-models/gradle.lockfile
+++ b/test-models/gradle.lockfile
@@ -9,30 +9,27 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
@@ -43,13 +40,12 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp
 io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -60,9 +56,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
@@ -75,54 +70,53 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/testing/gradle.lockfile b/testing/gradle.lockfile
index eaa14508..b8de27cb 100644
--- a/testing/gradle.lockfile
+++ b/testing/gradle.lockfile
@@ -9,30 +9,27 @@ com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeC
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:32.0.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath
-commons-codec:commons-codec:1.15=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath
@@ -43,13 +40,12 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp
 io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -60,9 +56,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
@@ -76,54 +71,53 @@ org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath
 org.assertj:assertj-core:3.27.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
+org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=spotbugsPlugins
diff --git a/testing/src/test/groovy/com/mx/path/testing/WithRequestExpectationsTest.groovy b/testing/src/test/groovy/com/mx/path/testing/WithRequestExpectationsTest.groovy
index 65599d74..406db8ca 100644
--- a/testing/src/test/groovy/com/mx/path/testing/WithRequestExpectationsTest.groovy
+++ b/testing/src/test/groovy/com/mx/path/testing/WithRequestExpectationsTest.groovy
@@ -2,13 +2,13 @@ package com.mx.path.testing
 
 import static org.mockito.Mockito.mock
 
+import com.mx.path.core.common.connect.Request
 import com.mx.path.testing.request.RequestExpectations
-import com.mx.path.testing.request.RequestMatcher
 import com.mx.testing.TestConnection
 
-import spock.lang.Specification
+import org.mockito.Mockito
 
-class WithRequestExpectationsTest extends Specification implements WithRequestExpectations {
+class WithRequestExpectationsTest extends Mockery {
 
   def cleanup() {
     RequestExpectations.reset()
@@ -83,7 +83,7 @@ class WithRequestExpectationsTest extends Specification implements WithRequestEx
 
   def "request() returns first captured request"() {
     given:
-    def req = mock(com.mx.path.core.common.connect.Request)
+    def req = mock(Request)
     RequestExpectations.addRequest(req)
 
     expect:
@@ -92,8 +92,8 @@ class WithRequestExpectationsTest extends Specification implements WithRequestEx
 
   def "request(matcher) returns matching request"() {
     given:
-    def req = mock(com.mx.path.core.common.connect.Request)
-    org.mockito.Mockito.when(req.getPath()).thenReturn("accounts")
+    def req = mock(Request)
+    Mockito.when(req.getPath()).thenReturn("accounts")
     RequestExpectations.addRequest(req)
 
     expect:
@@ -103,8 +103,8 @@ class WithRequestExpectationsTest extends Specification implements WithRequestEx
 
   def "requests() returns all captured requests"() {
     given:
-    RequestExpectations.addRequest(mock(com.mx.path.core.common.connect.Request))
-    RequestExpectations.addRequest(mock(com.mx.path.core.common.connect.Request))
+    RequestExpectations.addRequest(mock(Request))
+    RequestExpectations.addRequest(mock(Request))
 
     expect:
     requests().size() == 2
@@ -112,7 +112,7 @@ class WithRequestExpectationsTest extends Specification implements WithRequestEx
 
   def "exactly creates a matcher for the given request"() {
     given:
-    def req = mock(com.mx.path.core.common.connect.Request)
+    def req = mock(Request)
 
     when:
     def matcher = exactly(req)
@@ -124,10 +124,10 @@ class WithRequestExpectationsTest extends Specification implements WithRequestEx
 
   def "requests(matcher) returns filtered requests"() {
     given:
-    def req = mock(com.mx.path.core.common.connect.Request)
-    org.mockito.Mockito.when(req.getPath()).thenReturn("accounts")
+    def req = mock(Request)
+    Mockito.when(req.getPath()).thenReturn("accounts")
     RequestExpectations.addRequest(req)
-    RequestExpectations.addRequest(mock(com.mx.path.core.common.connect.Request))
+    RequestExpectations.addRequest(mock(Request))
 
     expect:
     requests(withPath("accounts")).size() == 1
diff --git a/utilities/build.gradle b/utilities/build.gradle
index 014cff3a..e3ed9106 100644
--- a/utilities/build.gradle
+++ b/utilities/build.gradle
@@ -5,12 +5,5 @@ coppuccino {
 }
 
 dependencies {
-  api "com.auth0:java-jwt:[4.5.1, 5.0.0)" // For JWT Parsing Library
-
-  constraints {
-    // Transitive dependency of com.auth0:java-jwt:4.5.1
-    api("com.fasterxml.jackson.core:jackson-core:2.21.1") {
-      because "Fixes High Severity vulnerability SNYK-JAVA-COMFASTERXMLJACKSONCORE-15365924"
-    }
-  }
+  api("com.auth0:java-jwt:[4.5.2, 5.0.0)")
 }
diff --git a/utilities/gradle.lockfile b/utilities/gradle.lockfile
index 90dd43fe..3252b437 100644
--- a/utilities/gradle.lockfile
+++ b/utilities/gradle.lockfile
@@ -7,23 +7,22 @@ com.fasterxml.jackson.core:jackson-core:2.21.3=runtimeClasspath,testRuntimeClass
 com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
-com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor
+com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
 com.google.code.gson:gson:2.13.2=pmd
 com.google.code.gson:gson:2.14.0=spotbugs
-com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.41.0=pmd
+com.google.errorprone:error_prone_annotations:2.47.0=checkstyle
 com.google.errorprone:error_prone_annotations:2.48.0=spotbugs
 com.google.guava:failureaccess:1.0.3=checkstyle
-com.google.guava:guava:33.4.8-jre=checkstyle
+com.google.guava:guava:33.6.0-jre=checkstyle
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle
-com.google.j2objc:j2objc-annotations:3.0.0=checkstyle
-com.puppycrawl.tools:checkstyle:10.25.0=checkstyle
+com.google.j2objc:j2objc-annotations:3.1=checkstyle
+com.puppycrawl.tools:checkstyle:13.7.0=checkstyle
 commons-beanutils:commons-beanutils:1.11.0=checkstyle
-commons-codec:commons-codec:1.15=checkstyle
+commons-codec:commons-codec:1.11=checkstyle
 commons-collections:commons-collections:3.2.2=checkstyle
 commons-io:commons-io:2.21.0=spotbugs
 info.picocli:picocli:4.7.7=checkstyle
@@ -31,8 +30,7 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.5=checkstyle
-net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs
+net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd,spotbugs
 net.sourceforge.pmd:pmd-ant:7.22.0=pmd
 net.sourceforge.pmd:pmd-core:7.22.0=pmd
 net.sourceforge.pmd:pmd-java:7.22.0=pmd
@@ -43,9 +41,8 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle
 org.apache.commons:commons-lang3:3.20.0=pmd,spotbugs
 org.apache.commons:commons-text:1.15.0=spotbugs
 org.apache.commons:commons-text:1.3=checkstyle
-org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
-org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
+org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.13=checkstyle
 org.apache.httpcomponents:httpcore:4.4.14=checkstyle
 org.apache.logging.log4j:log4j-api:2.26.0=spotbugs
@@ -56,47 +53,46 @@ org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
 org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
 org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.49.3=checkstyle
 org.checkerframework:checker-qual:3.53.1=pmd
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
 org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
 org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
 org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
 org.dom4j:dom4j:2.2.0=spotbugs
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.javassist:javassist:3.28.0-GA=checkstyle
 org.jspecify:jspecify:1.0.0=checkstyle
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:6.1.0=spotbugs
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor
 org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm-analysis:9.10.1=spotbugs
 org.ow2.asm:asm-commons:9.10.1=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
+org.ow2.asm:asm-commons:9.9=jacocoAnt
 org.ow2.asm:asm-tree:9.10.1=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
+org.ow2.asm:asm-tree:9.9=jacocoAnt
 org.ow2.asm:asm-util:9.10.1=spotbugs
 org.ow2.asm:asm:9.10.1=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
+org.ow2.asm:asm:9.9=jacocoAnt
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
-org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
+org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=checkstyle
 org.slf4j:jul-to-slf4j:1.7.36=pmd
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.2.2=checkstyle
-org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs
+org.slf4j:slf4j-simple:2.0.18=checkstyle
+org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs
 empty=spotbugsPlugins
diff --git a/utilities/src/test/groovy/com/mx/path/core/utility/jwt/JWTUtilityTest.groovy b/utilities/src/test/groovy/com/mx/path/core/utility/jwt/JWTUtilityTest.groovy
index 7d42716e..cfad9742 100644
--- a/utilities/src/test/groovy/com/mx/path/core/utility/jwt/JWTUtilityTest.groovy
+++ b/utilities/src/test/groovy/com/mx/path/core/utility/jwt/JWTUtilityTest.groovy
@@ -27,7 +27,7 @@ class JWTUtilityTest extends Specification  {
 
   def "validating a proper JWT with passing wrong client name"(){
     when:
-    String jwt = JWTUtility.generateNewJWT("userID", "sessionID", "ClientName", "secret", 1)
+    String jwt = JWTUtility.generateNewJWT("userID", "sessionID", "ClientName", "secret", 100)
 
     then: "Only valid with correct issuer"
     !JWTUtility.isValidJWT(jwt, "secret", "")