From b68bf3e104c912f8ce118548a2aaf6ec49caf6d9 Mon Sep 17 00:00:00 2001
From: "loushaokun.3" <loushaokun.3@jd.com>
Date: Tue, 4 Aug 2026 19:08:44 +0800
Subject: [PATCH] Keep MockServer client and container versions in sync

---
 container-tests/build.gradle.kts                           | 1 +
 .../test/java/okhttp3/containers/BasicMockServerTest.kt    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/container-tests/build.gradle.kts b/container-tests/build.gradle.kts
index 88ff8f415190..90c98809c3f1 100644
--- a/container-tests/build.gradle.kts
+++ b/container-tests/build.gradle.kts
@@ -21,6 +21,7 @@ tasks.withType<Test> {
   jvmArgs(
     "-Dokhttp.platform=$platform",
   )
+  systemProperty("mockserver.version", libs.versions.mockserver.client.get())
 
   if (platform == "loom") {
     jvmArgs(
diff --git a/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt b/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt
index 49272c29283f..d635187774a7 100644
--- a/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt
+++ b/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt
@@ -78,10 +78,15 @@ class BasicMockServerTest {
   }
 
   companion object {
+    private val mockServerVersion =
+      checkNotNull(System.getProperty("mockserver.version")) {
+        "mockserver.version is not set"
+      }
+
     val MOCKSERVER_IMAGE: DockerImageName =
       DockerImageName
         .parse("mockserver/mockserver")
-        .withTag("mockserver-7.4.0")
+        .withTag("mockserver-$mockServerVersion")
 
     fun OkHttpClient.Builder.trustMockServer(): OkHttpClient.Builder =
       apply {