From 3aa6254b3f23b1aa3ed3d8cc82e58f2e26c73dfb Mon Sep 17 00:00:00 2001
From: Scott Mitchell <scott_mitchell@apple.com>
Date: Thu, 21 Sep 2023 14:22:27 -0700
Subject: [PATCH] add mockitoCorePreJdk11Version

---
 build.gradle      | 2 +-
 gradle.properties | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0b4b1f1b84..7e7c79adf4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ quality.dependsOn validateLocalDocSite
 subprojects {
   // mockito 5 only supports jdk11+
   if (JavaVersion.current() < JavaVersion.VERSION_11) {
-    project.setProperty("mockitoCoreVersion", "4.11.0")
+    project.setProperty("mockitoCoreVersion", mockitoCorePreJdk11Version)
   }
   // Used by ci-release.yaml to determine which modules need to be built/released with JDK11.
   task printJavaTargetCompatibility {
diff --git a/gradle.properties b/gradle.properties
index c05ae6a1ec..8316827667 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -72,8 +72,9 @@ junit5Version=5.9.3
 testngVersion=7.5
 assertJCoreVersion=3.24.2
 hamcrestVersion=2.2
-# mockito version is overridden for <jdk11 in build.gradle
 mockitoCoreVersion=5.5.0
+# mockito version is overridden for <jdk11 due to incompatibilities with newer bytebuddy and class format
+mockitoCorePreJdk11Version=4.11.0
 spotbugsPluginVersion=5.0.13
 
 apacheDirectoryServerVersion=1.5.7