Skip to content

[#11449] Fix Mockito agent: use late binding @{} interpolation and extend to failsafe plugin #12369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hiteshsai007 wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −16
Open

[#11449] Fix Mockito agent: use late binding @{} interpolation and extend to failsafe plugin #12369

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cad307
[MNG-11449] Fix Mockito agent: use late binding @{} interpolation and…
Hiteshsai007 Jun 25, 2026
2db4fbb
[MNG-11449] Fix Mockito agent profile collision with JaCoCo profile
Hiteshsai007 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ under the License.
<woodstoxVersion>7.2.1</woodstoxVersion>
<xmlunitVersion>2.12.0</xmlunitVersion>
<jacocoArgLine />
<argLine.xmx>-Xmx256m</argLine.xmx>
<argLine.mockito />

<!-- Set as system property in surefire/failsafe to propagate to tests and IT Verifier -->
<toolboxVersion>0.14.1</toolboxVersion>
Expand Down Expand Up @@ -697,7 +699,7 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
<argLine>-Xmx256m @{jacocoArgLine}</argLine>
<argLine>${argLine.xmx} @{jacocoArgLine} ${argLine.mockito}</argLine>
<systemPropertyVariables combine.children="append">
<version.toolbox>${toolboxVersion}</version.toolbox>
</systemPropertyVariables>
Expand All @@ -708,7 +710,7 @@ under the License.
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
<argLine>-Xmx256m @{jacocoArgLine}</argLine>
<argLine>${argLine.xmx} @{jacocoArgLine} ${argLine.mockito}</argLine>
<systemPropertyVariables combine.children="append">
<version.toolbox>${toolboxVersion}</version.toolbox>
</systemPropertyVariables>
Expand Down Expand Up @@ -945,19 +947,9 @@ under the License.
<name>org.mockito:mockito-core:jar</name>
</property>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx256m -javaagent:${org.mockito:mockito-core:jar}</argLine>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<properties>
<argLine.mockito>-javaagent:@{org.mockito:mockito-core:jar}</argLine.mockito>
</properties>
</profile>
<profile>
<id>graph</id>
Expand Down Expand Up @@ -1211,13 +1203,15 @@ under the License.
</profile>
<profile>
<id>jacoco</id>
<properties>
<argLine.xmx>-Xmx1G</argLine.xmx>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1G @{jacocoArgLine}</argLine>
<reportsDirectory>${project.build.directory}/test-results-surefire</reportsDirectory>
</configuration>
</plugin>
Expand Down
Loading