From c034394022bdef317954a81e3327537c9ebc6c01 Mon Sep 17 00:00:00 2001
From: Philipp Fehre <philipp@fehre.co.uk>
Date: Thu, 23 Oct 2025 15:35:03 +0200
Subject: [PATCH 1/2] fix: remove fork configuration

- Added previously to get around test issues, reuseForks false and forkCount 1 are
  no longer needed.
- configure mockito as a javaagent to remove warning on newer Java versions

Signed-off-by: Philipp Fehre <philipp@fehre.co.uk>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f16854c8c..1940a4785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,8 @@
         <skip.tests>false</skip.tests>
         <!-- this will throw an error if we use wrong apis -->
         <maven.compiler.release>11</maven.compiler.release>
+        <org.mockito.jar>${settings.localRepository}/org/mockito/mockito-core/${org.mockito.version}/mockito-core-${org.mockito.version}.jar</org.mockito.jar>
+        <surefireArgLine>-javaagent:${org.mockito.jar}</surefireArgLine>
     </properties>
 
     <name>OpenFeature Java SDK</name>
@@ -300,8 +302,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.4</version>
                 <configuration>
-                    <forkCount>1</forkCount>
-                    <reuseForks>false</reuseForks>
                     <argLine>
                         ${surefireArgLine}
                         --add-opens java.base/java.util=ALL-UNNAMED

From 16f86b012f7cee7ba59117976035d53bf6f2e765 Mon Sep 17 00:00:00 2001
From: Philipp Fehre <philipp@fehre.co.uk>
Date: Fri, 24 Oct 2025 13:53:40 +0200
Subject: [PATCH 2/2] fix: move mockito argLine to all test plugins

surefire, failsafe, vmlens all need mockito argline to work with Java 21+ to
avoid deprecated dynamic java agent loading.

Signed-off-by: Philipp Fehre <philipp@fehre.co.uk>
---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1940a4785..e07c0dccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <!-- this will throw an error if we use wrong apis -->
         <maven.compiler.release>11</maven.compiler.release>
         <org.mockito.jar>${settings.localRepository}/org/mockito/mockito-core/${org.mockito.version}/mockito-core-${org.mockito.version}.jar</org.mockito.jar>
-        <surefireArgLine>-javaagent:${org.mockito.jar}</surefireArgLine>
+        <org.mockito.agent.argline>-javaagent:${org.mockito.jar}</org.mockito.agent.argline>
     </properties>
 
     <name>OpenFeature Java SDK</name>
@@ -304,6 +304,7 @@
                 <configuration>
                     <argLine>
                         ${surefireArgLine}
+                        ${org.mockito.agent.argline}
                         --add-opens java.base/java.util=ALL-UNNAMED
                         --add-opens java.base/java.lang=ALL-UNNAMED
                     </argLine>
@@ -321,6 +322,7 @@
                 <configuration>
                     <argLine>
                         ${surefireArgLine}
+                        ${org.mockito.agent.argline}
                     </argLine>
                 </configuration>
             </plugin>
@@ -364,6 +366,7 @@
 						                <include>**/*CT.java</include>
 					                </includes>
                                     <failIfNoTests>true</failIfNoTests>
+                                    <argLine>${org.mockito.agent.argline}</argLine>
                                 </configuration>
                             </execution>
                         </executions>
@@ -740,6 +743,7 @@
                         <version>3.5.4</version>
                         <configuration>
                             <argLine>
+                                ${org.mockito.agent.argline}
                                 ${surefireArgLine}
                             </argLine>
                         </configuration>