From 42f5ab4e5f0a92fd29d380e474bc99a3c183c9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?= <acogoluegnes@gmail.com>
Date: Thu, 3 Oct 2024 10:19:10 +0200
Subject: [PATCH] Add Mockito as agent in Java 21+

---
 pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 997b9ae83..fcbf1a7de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
         <micrometer-tracing-test.version>1.3.4</micrometer-tracing-test.version>
         <micrometer-docs-generator.version>1.0.4</micrometer-docs-generator.version>
         <maven.compiler.plugin.version>3.13.0</maven.compiler.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-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -291,6 +292,19 @@
                 </configuration>
             </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>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
@@ -579,7 +593,7 @@
                 <jdk>[21,)</jdk>
             </activation>
             <properties>
-                <test-arguments>-Xshare:off -XX:+EnableDynamicAgentLoading</test-arguments>
+                <test-arguments>-Xshare:off -javaagent:${org.mockito:mockito-core:jar}</test-arguments>
             </properties>
         </profile>