diff --git a/build.gradle b/build.gradle
index 37f535c7..7ca70c25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-  id "com.github.mxenabled.coppuccino" version "6.+" apply false
-  id "com.github.mxenabled.vogue" version "3.+" apply false
+  id "com.github.mxenabled.coppuccino" version "7.+" apply false
+  id "com.github.mxenabled.vogue" version "4.+" apply false
   id "idea"
   id "io.freefair.lombok" version "8.+" apply false
   id "io.github.gradle-nexus.publish-plugin" version "1.1.+"
@@ -37,7 +37,7 @@ subprojects {
 
     java {
       toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
       }
       withSourcesJar()
       withJavadocJar()
@@ -99,7 +99,7 @@ subprojects {
         }
       }
 
-      testImplementation "org.mockito:mockito-inline:${project.ext.mockitoVersion}"
+      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}"
     }
@@ -206,6 +206,6 @@ tasks.named("dependencies") {
 }
 
 wrapper {
-  gradleVersion = "7.6.4"
+  gradleVersion = "8.14.3"
   distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/common/gradle.lockfile b/common/gradle.lockfile
index 9c9f2fcc..54dc0c03 100644
--- a/common/gradle.lockfile
+++ b/common/gradle.lockfile
@@ -27,8 +27,8 @@ commons-io:commons-io:2.20.0=spotbugs
 info.picocli:picocli:4.7.7=checkstyle
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -66,28 +66,26 @@ 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.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/context/gradle.lockfile b/context/gradle.lockfile
index 4323bb3f..9c9e349a 100644
--- a/context/gradle.lockfile
+++ b/context/gradle.lockfile
@@ -36,8 +36,8 @@ 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
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.9=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.9=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -75,28 +75,26 @@ 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.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/gateway-generator/gradle.lockfile b/gateway-generator/gradle.lockfile
index 897fb6b4..40b15a8b 100644
--- a/gateway-generator/gradle.lockfile
+++ b/gateway-generator/gradle.lockfile
@@ -51,8 +51,8 @@ jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspat
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -97,28 +97,26 @@ org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompile
 org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/gateway/gradle.lockfile b/gateway/gradle.lockfile
index 3eaf1787..03a6de2e 100644
--- a/gateway/gradle.lockfile
+++ b/gateway/gradle.lockfile
@@ -46,8 +46,8 @@ jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspat
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -91,28 +91,26 @@ org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompile
 org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index afba1092..1b33c55b 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 5c00f617..7705927e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..23d15a93 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/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/.
@@ -83,10 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,10 +133,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,16 +200,20 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f..db3a6ac2 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+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
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+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
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%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" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/http/gradle.lockfile b/http/gradle.lockfile
index 9d8beb0a..ed963b36 100644
--- a/http/gradle.lockfile
+++ b/http/gradle.lockfile
@@ -46,8 +46,8 @@ jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspat
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -91,28 +91,26 @@ org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompile
 org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/jitpack.yml b/jitpack.yml
index efde7bf2..727c9abd 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,2 +1,2 @@
 jdk:
-  - openjdk17
+  - openjdk21
diff --git a/messaging/gradle.lockfile b/messaging/gradle.lockfile
index 258d6b79..d506555f 100644
--- a/messaging/gradle.lockfile
+++ b/messaging/gradle.lockfile
@@ -37,8 +37,8 @@ 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
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -76,28 +76,26 @@ 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.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/messaging/src/main/java/com/mx/path/connect/messaging/MessageErrorThrowableSerializer.java b/messaging/src/main/java/com/mx/path/connect/messaging/MessageErrorThrowableSerializer.java
deleted file mode 100644
index 12e57861..00000000
--- a/messaging/src/main/java/com/mx/path/connect/messaging/MessageErrorThrowableSerializer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mx.path.connect.messaging;
-
-import java.lang.reflect.Type;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.JsonSyntaxException;
-import com.mx.path.core.common.messaging.MessageError;
-import com.mx.path.core.common.messaging.MessageStatus;
-import com.mx.path.core.common.messaging.RemoteException;
-
-/**
- * Utility class to deserialize {@link JsonElement}.
- */
-public class MessageErrorThrowableSerializer implements JsonDeserializer<Throwable>, JsonSerializer<Throwable> {
-  private final Gson gson = new GsonBuilder().create();
-
-  @Override
-  public final Throwable deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-    JsonObject object = (JsonObject) json;
-    String typeName = object.getAsJsonPrimitive("_type").getAsString();
-    try {
-      Class<?> klass = Class.forName(typeName);
-      return (Throwable) gson.fromJson(json, klass);
-    } catch (ClassNotFoundException e) {
-      try {
-        RemoteException remoteException = gson.fromJson(json, RemoteException.class);
-        remoteException.fillInStackTrace();
-        remoteException.setOriginalType(typeName);
-        return remoteException;
-      } catch (JsonSyntaxException ex) {
-        throw new MessageError("Could not deserialize a message error", MessageStatus.FAIL, ex);
-      }
-    }
-  }
-
-  @Override
-  public final JsonElement serialize(Throwable src, Type typeOfSrc, JsonSerializationContext context) {
-    JsonObject element = (JsonObject) gson.toJsonTree(src);
-    element.addProperty("_type", src.getClass().getCanonicalName());
-    return element;
-  }
-}
diff --git a/messaging/src/test/groovy/com/mx/path/connect/messaging/MessageErrorThrowableSerializerTest.groovy b/messaging/src/test/groovy/com/mx/path/connect/messaging/MessageErrorThrowableSerializerTest.groovy
deleted file mode 100644
index 9332a937..00000000
--- a/messaging/src/test/groovy/com/mx/path/connect/messaging/MessageErrorThrowableSerializerTest.groovy
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.mx.path.connect.messaging
-
-import com.google.gson.GsonBuilder
-import com.mx.path.core.common.accessor.PathResponseStatus
-import com.mx.path.core.common.messaging.MessageError
-import com.mx.path.core.common.messaging.MessageStatus
-import com.mx.path.core.common.messaging.RemoteException
-import com.mx.path.core.common.serialization.ThrowableTypeAdapter
-
-import spock.lang.Specification
-
-class MessageErrorThrowableSerializerTest extends Specification {
-
-  def "test MessageErrorThrowableSerializer"() {
-    given:
-    def gson = new GsonBuilder().registerTypeAdapter(Throwable.class, new MessageErrorThrowableSerializer()).create()
-    Throwable exception = new MessageError("Something bad happened", MessageStatus.DISABLED, null)
-    MessageResponse response = MessageResponse.builder().body("hi").exception(exception).build()
-
-    when:
-    def serialized = gson.toJson(response)
-    System.out.println(serialized)
-    def deserialized = gson.fromJson(serialized, MessageResponse.class)
-
-    then:
-    deserialized.exception.class == MessageError
-    ((MessageError) deserialized.exception).messageStatus == MessageStatus.DISABLED
-  }
-
-  def "test MessageErrorThrowableSerializer unknown cause"() {
-    given:
-    def gson = new GsonBuilder().registerTypeAdapter(Throwable.class, new MessageErrorThrowableSerializer()).create()
-    def responseJson = "{\"status\":\"FAIL\",\"exception\":{\"headers\":{},\"message\":\"The credentials provided were invalid.\",\"report\":true,\"status\":\"USER_ERROR\",\"userMessage\":\"The credentials provided were invalid.\",\"detailMessage\":\"The credentials provided were invalid.\",\"stackTrace\":[],\"suppressedExceptions\":[],\"_type\":\"anUnknownExceptionType\"}}"
-    MessageResponse response = MessageResponse.fromJson(responseJson)
-
-    when:
-    def serialized = gson.toJson(response)
-    def deserialized = gson.fromJson(serialized, MessageResponse.class)
-
-    then:
-    deserialized.status == MessageStatus.FAIL
-    deserialized.exception.class == RemoteException
-    ((RemoteException) deserialized.exception).message == "The credentials provided were invalid."
-    ((RemoteException) deserialized.exception).userMessage == "The credentials provided were invalid."
-    ((RemoteException) deserialized.exception).shouldReport()
-    ((RemoteException) deserialized.exception).status == PathResponseStatus.USER_ERROR
-    ((RemoteException) deserialized.exception).originalType == "anUnknownExceptionType"
-  }
-
-  def "backward compatibility with ThrowableTypeAdapter"() {
-    given:
-    def legacyGson = new GsonBuilder().registerTypeAdapter(Throwable.class, new MessageErrorThrowableSerializer()).create()
-    Throwable exception = new MessageError("Something bad happened", MessageStatus.DISABLED, null)
-    MessageResponse response = MessageResponse.builder().body("hi").exception(exception).build()
-
-    def newGson = new GsonBuilder().registerTypeAdapter(Throwable.class, new ThrowableTypeAdapter()).create()
-
-    when:
-    def serialized = legacyGson.toJson(response)
-    def deserialized = newGson.fromJson(serialized, MessageResponse.class)
-
-    then:
-    deserialized.exception instanceof MessageError
-    deserialized.exception.message == "Something bad happened"
-  }
-
-  def "forward compatibility with ThrowableTypeAdapter"() {
-    given:
-    def legacyGson = new GsonBuilder().registerTypeAdapter(Throwable.class, new MessageErrorThrowableSerializer()).create()
-    Throwable exception = new MessageError("Something bad happened", MessageStatus.DISABLED, null)
-    MessageResponse response = MessageResponse.builder().body("hi").exception(exception).build()
-
-    def newGson = new GsonBuilder().registerTypeAdapter(Throwable.class, new ThrowableTypeAdapter()).create()
-
-    when:
-    def serialized = newGson.toJson(response)
-    def deserialized = legacyGson.fromJson(serialized, MessageResponse.class)
-
-    then:
-    deserialized.exception instanceof MessageError
-    deserialized.exception.message == "Something bad happened"
-  }
-}
diff --git a/messaging/src/test/groovy/com/mx/path/connect/messaging/remote/RemoteServiceTest.groovy b/messaging/src/test/groovy/com/mx/path/connect/messaging/remote/RemoteServiceTest.groovy
index 16318446..176c12d3 100644
--- a/messaging/src/test/groovy/com/mx/path/connect/messaging/remote/RemoteServiceTest.groovy
+++ b/messaging/src/test/groovy/com/mx/path/connect/messaging/remote/RemoteServiceTest.groovy
@@ -286,7 +286,7 @@ class RemoteServiceTest extends Specification {
 
     when:
     def responseStr = noOpSubject.respond("path.request.client.RemoteAccount.not_implemented", message.toJson())
-    MessageResponse response = new Gson().fromJson(responseStr, MessageResponse)
+    MessageResponse response = MessageResponse.fromJson(responseStr)
 
     then:
     noExceptionThrown()
diff --git a/test-gateway-generator/gradle.lockfile b/test-gateway-generator/gradle.lockfile
index 213e926c..9917c79c 100644
--- a/test-gateway-generator/gradle.lockfile
+++ b/test-gateway-generator/gradle.lockfile
@@ -36,8 +36,8 @@ jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspat
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.9=spotbugs
 org.apache.bcel:bcel:6.11.0=spotbugs
 org.apache.commons:commons-lang3:3.19.0=spotbugs
@@ -57,27 +57,25 @@ org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompile
 org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
 org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath
diff --git a/test-gateways/gradle.lockfile b/test-gateways/gradle.lockfile
index eb49f284..f9b5feb4 100644
--- a/test-gateways/gradle.lockfile
+++ b/test-gateways/gradle.lockfile
@@ -46,8 +46,8 @@ jakarta.activation:jakarta.activation-api:2.1.4=annotationProcessor,compileClass
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -91,28 +91,26 @@ org.glassfish.jaxb:jaxb-core:4.0.6=annotationProcessor,compileClasspath,runtimeC
 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.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/test-models/gradle.lockfile b/test-models/gradle.lockfile
index 757fc7a9..04b1b599 100644
--- a/test-models/gradle.lockfile
+++ b/test-models/gradle.lockfile
@@ -45,8 +45,8 @@ jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspat
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -90,28 +90,26 @@ org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompile
 org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/testing/build.gradle b/testing/build.gradle
index fba9037e..9ee02bac 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -2,7 +2,7 @@ dependencies {
   implementation project(":gateway")
   implementation "org.assertj:assertj-core:[3.0,4.0)"
 
-  api "org.mockito:mockito-inline:${project.ext.mockitoVersion}"
+  api "org.mockito:mockito-core:${project.ext.mockitoVersion}"
   api "org.spockframework:spock-core:${project.ext.spockVersion}"
   api "org.junit.jupiter:junit-jupiter-api:${project.ext.junitVersion}"
 }
diff --git a/testing/gradle.lockfile b/testing/gradle.lockfile
index 91f0f609..9db1307f 100644
--- a/testing/gradle.lockfile
+++ b/testing/gradle.lockfile
@@ -45,7 +45,7 @@ jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspat
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
@@ -91,28 +91,26 @@ org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompile
 org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd
diff --git a/utilities/gradle.lockfile b/utilities/gradle.lockfile
index d748a200..adcff32b 100644
--- a/utilities/gradle.lockfile
+++ b/utilities/gradle.lockfile
@@ -26,8 +26,8 @@ commons-io:commons-io:2.20.0=spotbugs
 info.picocli:picocli:4.7.7=checkstyle
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
+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.sourceforge.pmd:pmd-ant:7.22.0=pmd
@@ -63,28 +63,26 @@ 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.8=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
+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.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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
+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.2=jacocoAnt
 org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=jacocoAnt
+org.ow2.asm:asm-commons:9.8=jacocoAnt
 org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.2=jacocoAnt
+org.ow2.asm:asm-tree:9.8=jacocoAnt
 org.ow2.asm:asm-tree:9.9=spotbugs
 org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=jacocoAnt
+org.ow2.asm:asm:9.8=jacocoAnt
 org.ow2.asm:asm:9.9=spotbugs
 org.ow2.asm:asm:9.9.1=pmd
 org.pcollections:pcollections:4.0.2=pmd