From ce000e17d8dd39445acb9e6a4fed6021878be8b9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 May 2026 08:45:37 +0000
Subject: [PATCH 1/2] Update dependency org.mock-server:mockserver-netty to v6

---
 dependencyManagement/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 93e89248b52..cc72bfeb1d2 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -99,7 +99,7 @@ val DEPENDENCIES = listOf(
   "org.codehaus.mojo:animal-sniffer-annotations:1.27",
   "org.jctools:jctools-core:4.0.6",
   "org.junit-pioneer:junit-pioneer:1.9.1",
-  "org.mock-server:mockserver-netty:5.15.0:shaded",
+  "org.mock-server:mockserver-netty:6.1.0:shaded",
   "org.osgi:osgi.core:8.0.0",
   "org.skyscreamer:jsonassert:1.5.3",
   "com.android.tools:desugar_jdk_libs:2.1.5",

From c5993ba9b8c4b01f566537b435a66411e5f0f36d Mon Sep 17 00:00:00 2001
From: Jack Berg <34418638+jack-berg@users.noreply.github.com>
Date: Thu, 28 May 2026 15:04:18 -0500
Subject: [PATCH 2/2] Pin mockserver-netty to 5.x, revert upgrade to 6.x

---
 .github/renovate.json5                | 6 ++++++
 dependencyManagement/build.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 1cff2b95654..baa6ea38b31 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -152,6 +152,12 @@
       matchUpdateTypes: ['major'],
       enabled: false,
     },
+    {
+      // mockserver-netty 6+ requires Java 11+
+      matchPackageNames: ['org.mock-server:mockserver-netty'],
+      matchUpdateTypes: ['major'],
+      enabled: false,
+    },
   ],
   customManagers: [
     {
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index cc72bfeb1d2..93e89248b52 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -99,7 +99,7 @@ val DEPENDENCIES = listOf(
   "org.codehaus.mojo:animal-sniffer-annotations:1.27",
   "org.jctools:jctools-core:4.0.6",
   "org.junit-pioneer:junit-pioneer:1.9.1",
-  "org.mock-server:mockserver-netty:6.1.0:shaded",
+  "org.mock-server:mockserver-netty:5.15.0:shaded",
   "org.osgi:osgi.core:8.0.0",
   "org.skyscreamer:jsonassert:1.5.3",
   "com.android.tools:desugar_jdk_libs:2.1.5",