diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 473211f0..d1df344f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17, 21 ]
+        java: [ 17, 21, 25 ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index af3f0b51..efb53e85 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -206,7 +206,7 @@
   jib = 'com.google.cloud.tools.jib:3.4.5'
   jsonschema2pojo = 'org.jsonschema2pojo:1.2.2'
   nexus-publish = 'io.github.gradle-nexus.publish-plugin:1.3.0'
-  openapi-generator = 'org.openapi.generator:7.5.0'
+  openapi-generator = 'org.openapi.generator:7.17.0'
   protobuf = 'com.google.protobuf:0.9.4'
   shadow = 'com.gradleup.shadow:9.0.0-beta8'
   spotless = 'com.diffplug.spotless:7.2.1'
@@ -220,7 +220,7 @@
 
 [versions]
   jackson = '2.18.4'
-  junit = '5.10.2'
+  junit = '5.14.1'
   kotlinx-coroutines = '1.10.2'
   kotlinx-serialization = '1.9.0'
   ksp = '2.2.10-2.0.2'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b95..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 d4081da4..bad7c246 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b..23d15a93 100755
--- a/gradlew
+++ b/gradlew
@@ -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.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * 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.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 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 9d21a218..db3a6ac2 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ 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/sdk-core/build.gradle.kts b/sdk-core/build.gradle.kts
index 23935795..10d2724e 100644
--- a/sdk-core/build.gradle.kts
+++ b/sdk-core/build.gradle.kts
@@ -68,6 +68,7 @@ dependencies {
   testImplementation(libs.kotlinx.serialization.core)
   testImplementation(libs.vertx.junit5)
   testImplementation(libs.vertx.kotlin.coroutines)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 // Configure source sets for protobuf plugin and jsonschema2pojo
diff --git a/sdk-request-identity/build.gradle.kts b/sdk-request-identity/build.gradle.kts
index d13eff9c..21a8d670 100644
--- a/sdk-request-identity/build.gradle.kts
+++ b/sdk-request-identity/build.gradle.kts
@@ -18,4 +18,5 @@ dependencies {
 
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.assertj)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/sdk-serde-jackson/build.gradle.kts b/sdk-serde-jackson/build.gradle.kts
index 2e4e1df3..018cf8d2 100644
--- a/sdk-serde-jackson/build.gradle.kts
+++ b/sdk-serde-jackson/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
 
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.assertj)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Javadoc> { isFailOnError = false }
diff --git a/sdk-serde-kotlinx/build.gradle.kts b/sdk-serde-kotlinx/build.gradle.kts
index 7922b6c4..aa4b1041 100644
--- a/sdk-serde-kotlinx/build.gradle.kts
+++ b/sdk-serde-kotlinx/build.gradle.kts
@@ -16,4 +16,5 @@ dependencies {
 
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.assertj)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/sdk-spring-boot-kotlin-starter/build.gradle.kts b/sdk-spring-boot-kotlin-starter/build.gradle.kts
index de9939f8..1c84409f 100644
--- a/sdk-spring-boot-kotlin-starter/build.gradle.kts
+++ b/sdk-spring-boot-kotlin-starter/build.gradle.kts
@@ -28,4 +28,5 @@ dependencies {
   testImplementation(project(":sdk-core"))
   testImplementation(libs.jackson.annotations)
   testImplementation(libs.jackson.databind)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/sdk-spring-boot-starter/build.gradle.kts b/sdk-spring-boot-starter/build.gradle.kts
index 58543d7d..05d37c40 100644
--- a/sdk-spring-boot-starter/build.gradle.kts
+++ b/sdk-spring-boot-starter/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
   testImplementation(libs.jackson.databind)
   testImplementation(project(":sdk-serde-jackson"))
   testImplementation(project(":sdk-testing"))
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<JavaCompile> { options.compilerArgs.add("-parameters") }
diff --git a/sdk-spring-boot/build.gradle.kts b/sdk-spring-boot/build.gradle.kts
index 6e9397eb..edb7a47f 100644
--- a/sdk-spring-boot/build.gradle.kts
+++ b/sdk-spring-boot/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
   testImplementation(libs.spring.boot.starter)
   testImplementation(libs.spring.boot.starter.json)
   testImplementation(libs.spring.boot.starter.test)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<JavaCompile> { options.compilerArgs.add("-parameters") }
diff --git a/sdk-testing/build.gradle.kts b/sdk-testing/build.gradle.kts
index df84ed11..96802e8e 100644
--- a/sdk-testing/build.gradle.kts
+++ b/sdk-testing/build.gradle.kts
@@ -24,4 +24,5 @@ dependencies {
   testImplementation(libs.assertj)
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.log4j.core)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }