Skip to content

Commit 6f51d54

Browse files
committed
Fix mockito agent
1 parent 6a7d963 commit 6f51d54

2 files changed

Lines changed: 8 additions & 21 deletions

File tree

it/java8/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<plugins>
2323
<plugin>
2424
<artifactId>maven-surefire-plugin</artifactId>
25+
<configuration>
26+
<argLine>-showversion</argLine> <!-- Override default setting from adding mockito agent -->
27+
</configuration>
2528
</plugin>
2629
</plugins>
2730
</build>

pom.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,11 @@
215215
<plugin>
216216
<artifactId>maven-surefire-plugin</artifactId>
217217
<version>3.2.5</version>
218+
<configuration>
219+
<argLine>
220+
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
221+
</argLine>
222+
</configuration>
218223
</plugin>
219224
<plugin>
220225
<artifactId>maven-jar-plugin</artifactId>
@@ -355,26 +360,5 @@
355360
</plugins>
356361
</build>
357362
</profile>
358-
<profile>
359-
<id>mockito-agent</id>
360-
<activation>
361-
<jdk>[17,)</jdk>
362-
</activation>
363-
<build>
364-
<pluginManagement>
365-
<plugins>
366-
<plugin>
367-
<artifactId>maven-surefire-plugin</artifactId>
368-
<version>3.2.5</version>
369-
<configuration>
370-
<argLine>
371-
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
372-
</argLine>
373-
</configuration>
374-
</plugin>
375-
</plugins>
376-
</pluginManagement>
377-
</build>
378-
</profile>
379363
</profiles>
380364
</project>

0 commit comments

Comments
 (0)