From 6eb6204e82195cd23d4d548e552cb2ef69249e18 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Sat, 25 Jul 2026 22:37:52 +0100
Subject: [PATCH] Fix CI failures

---
 .../src/test/java/okhttp3/containers/BasicMockServerTest.kt    | 2 +-
 okcurl/build.gradle.kts                                        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt b/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt
index e3b13973ed74..49272c29283f 100644
--- a/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt
+++ b/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt
@@ -81,7 +81,7 @@ class BasicMockServerTest {
     val MOCKSERVER_IMAGE: DockerImageName =
       DockerImageName
         .parse("mockserver/mockserver")
-        .withTag("mockserver-5.15.0")
+        .withTag("mockserver-7.4.0")
 
     fun OkHttpClient.Builder.trustMockServer(): OkHttpClient.Builder =
       apply {
diff --git a/okcurl/build.gradle.kts b/okcurl/build.gradle.kts
index fbef093ed42e..440ba434bc5a 100644
--- a/okcurl/build.gradle.kts
+++ b/okcurl/build.gradle.kts
@@ -96,7 +96,8 @@ configure<GraalVMExtension> {
       javaLauncher.set(
         javaToolchains.launcherFor {
           languageVersion.set(JavaLanguageVersion.of(25))
-          vendor.set(JvmVendorSpec.GRAAL_VM)
+          // Match any native-image capable JDK rather than JvmVendorSpec.GRAAL_VM
+          nativeImageCapable.set(true)
         },
       )
     }