From 3106ad133a2c507bb5fe7eaa22b71f90b123a2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@gmail.com>
Date: Thu, 3 Oct 2024 10:33:57 +0200
Subject: [PATCH] Use Mockito as agent on Java 21+

---
 pom.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bbcf9c61..7a9e2952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
     <maven.install.plugin.version>3.1.3</maven.install.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
     <buildnumber.plugin.version>3.2.1</buildnumber.plugin.version>
+    <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>
     <maven.surefire.plugin.version>3.5.0</maven.surefire.plugin.version>
     <maven.failsafe.plugin.version>3.5.0</maven.failsafe.plugin.version>
     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
@@ -277,6 +278,19 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -491,17 +505,25 @@
         <mockito.version>4.11.0</mockito.version>
       </properties>
     </profile>
+    <profile>
+      <id>jvm-test-arguments-below-java-21</id>
+      <activation>
+        <jdk>[11,21)</jdk>
+      </activation>
+      <properties>
+        <test-arguments>-Xshare:off</test-arguments>
+      </properties>
+    </profile>
     <profile>
       <id>jvm-test-arguments-java-21-and-more</id>
       <activation>
         <jdk>[21,)</jdk>
       </activation>
       <properties>
-        <test-arguments>-XX:+EnableDynamicAgentLoading</test-arguments>
+        <test-arguments>-Xshare:off -javaagent:${org.mockito:mockito-core:jar}</test-arguments>
       </properties>
     </profile>
 
-
     <profile>
       <id>extensions</id>
       <activation>