From ff3e2d0a44be62a92853eb30342d270d3dc53fe9 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Mon, 21 Sep 2026 14:23:35 -0400
Subject: [PATCH] Use modern Mockito on Java 11+

Prepares for the next Commons Lang.
---
 pom.xml                                                | 10 ++++++++++
 .../bcel/classfile/ConstantPoolModuleToStringTest.java |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5ac68e8534..0ddbe02b17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -525,6 +525,16 @@
         <commons.jacoco.complexityRatio>0.58</commons.jacoco.complexityRatio>
       </properties>
     </profile>
+    <profile>
+      <id>java11-up</id>
+      <!-- Avoid Mockito failures on Java 21 and 25 -->
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <properties>
+        <commons.mockito.version>5.23.0</commons.mockito.version>
+      </properties>
+    </profile>
   </profiles>
   <developers>
     <developer>
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
index 64399ec471..519b00c2ab 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
@@ -397,8 +397,11 @@ public void visitModuleRequires(final ModuleRequires constantModule) {
                     "net.bytebuddy",
                     "com.sun.jna",
                     "junit",
-                    // com.azul.* for reproducibility with Azul JDK
-                    "com.azul.");
+                    "com.azul.",
+                    "com.github.spotbugs.annotations",
+                    "org.hamcrest",
+                    "org.objenesis",
+                    "org.jspecify");
             assertTrue(condition, s);
         }