Skip to content

Commit 418ceab

Browse files
committed
HSEARCH-5441 Explicitly add mockito agent to the surefire args
1 parent 4b891c7 commit 418ceab

File tree

18 files changed

+74
-1
lines changed

18 files changed

+74
-1
lines changed

backend/elasticsearch/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<!-- This is a publicly distributed module that should be published: -->
2222
<deploy.skip>false</deploy.skip>
2323
<java.module.name>org.hibernate.search.backend.elasticsearch</java.module.name>
24+
25+
<surefire.jvm.args.module>
26+
${test.mockito.agent.jvm.args}
27+
</surefire.jvm.args.module>
2428
</properties>
2529

2630
<dependencies>

backend/lucene/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<!-- This is a publicly distributed module that should be published: -->
1919
<deploy.skip>false</deploy.skip>
2020
<java.module.name>org.hibernate.search.backend.lucene</java.module.name>
21+
22+
<surefire.jvm.args.module>
23+
${test.mockito.agent.jvm.args}
24+
</surefire.jvm.args.module>
2125
</properties>
2226

2327
<dependencies>

build/parents/build/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,9 @@
271271
<!-- Eclipse plugin options -->
272272

273273
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
274+
275+
<!--Agents configuration -->
276+
<test.mockito.agent.jvm.args>-javaagent:${org.mockito:mockito-core:jar}</test.mockito.agent.jvm.args>
274277
</properties>
275278

276279
<dependencyManagement>
@@ -1430,6 +1433,17 @@
14301433
</execution>
14311434
</executions>
14321435
</plugin>
1436+
<plugin>
1437+
<groupId>org.apache.maven.plugins</groupId>
1438+
<artifactId>maven-dependency-plugin</artifactId>
1439+
<executions>
1440+
<execution>
1441+
<goals>
1442+
<goal>properties</goal>
1443+
</goals>
1444+
</execution>
1445+
</executions>
1446+
</plugin>
14331447
<plugin>
14341448
<groupId>org.apache.maven.plugins</groupId>
14351449
<artifactId>maven-enforcer-plugin</artifactId>

engine/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<!-- This is a publicly distributed module that should be published: -->
1717
<deploy.skip>false</deploy.skip>
1818
<java.module.name>org.hibernate.search.engine</java.module.name>
19+
20+
<surefire.jvm.args.module>
21+
${test.mockito.agent.jvm.args}
22+
</surefire.jvm.args.module>
1923
</properties>
2024

2125
<dependencies>

integrationtest/backend/elasticsearch/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
<properties>
1616
<surefire.module>elasticsearch</surefire.module>
17+
18+
<surefire.jvm.args.module>
19+
${test.mockito.agent.jvm.args}
20+
</surefire.jvm.args.module>
1721
</properties>
1822

1923
<dependencies>

integrationtest/backend/lucene/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
<properties>
1616
<surefire.module>lucene</surefire.module>
17+
<surefire.jvm.args.module>
18+
${test.mockito.agent.jvm.args}
19+
</surefire.jvm.args.module>
1720
</properties>
1821

1922
<dependencies>

integrationtest/backend/tck/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
<name>Hibernate Search ITs - Backend TCK</name>
1313
<description>Hibernate Search backend TCK, including tests for every feature common to all the backends</description>
1414

15+
<properties>
16+
<surefire.jvm.args.module>
17+
${test.mockito.agent.jvm.args}
18+
</surefire.jvm.args.module>
19+
</properties>
1520
<dependencies>
1621
<dependency>
1722
<groupId>org.hibernate.search</groupId>

integrationtest/mapper/orm-jakarta-batch/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<surefire.jvm.args.module>
1717
${test.elasticsearch.connection.jvm.args}
1818
${test.weld.jvm.args}
19+
${test.mockito.agent.jvm.args}
1920
</surefire.jvm.args.module>
2021

2122
<failsafe.lucene-jbatch.reportsDirectory>${project.build.directory}/failsafe-reports/lucene-jbatch</failsafe.lucene-jbatch.reportsDirectory>

integrationtest/mapper/orm-realbackend/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<failsafe.jvm.args.jacoco.lucene></failsafe.jvm.args.jacoco.lucene>
2626
<failsafe.jvm.args.jacoco.elasticsearch></failsafe.jvm.args.jacoco.elasticsearch>
2727
<failsafe.jvm.args.jacoco.multiplebackends></failsafe.jvm.args.jacoco.multiplebackends>
28+
<surefire.jvm.args.module>
29+
${test.mockito.agent.jvm.args}
30+
</surefire.jvm.args.module>
2831
</properties>
2932

3033
<dependencies>

integrationtest/mapper/orm/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
<name>Hibernate Search ITs - ORM</name>
1313
<description>Hibernate Search integration tests for the Hibernate ORM integration</description>
1414

15+
<properties>
16+
<surefire.jvm.args.module>
17+
${test.mockito.agent.jvm.args}
18+
</surefire.jvm.args.module>
19+
</properties>
20+
1521
<dependencies>
1622
<dependency>
1723
<groupId>org.hibernate.search</groupId>

0 commit comments

Comments
 (0)