Skip to content

HSEARCH-5441 Explicitly add mockito agent to the surefire args #4743

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

HSEARCH-5441 Explicitly add mockito agent to the surefire args #4743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions backend/elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<java.module.name>org.hibernate.search.backend.elasticsearch</java.module.name>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions backend/lucene/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<java.module.name>org.hibernate.search.backend.lucene</java.module.name>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
14 changes: 14 additions & 0 deletions build/parents/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@
<!-- Eclipse plugin options -->

<m2e.apt.activation>jdt_apt</m2e.apt.activation>

<!--Agents configuration -->
<test.mockito.agent.jvm.args>-javaagent:${org.mockito:mockito-core:jar}</test.mockito.agent.jvm.args>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -1430,6 +1433,17 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<java.module.name>org.hibernate.search.engine</java.module.name>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions integrationtest/backend/elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

<properties>
<surefire.module>elasticsearch</surefire.module>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
3 changes: 3 additions & 0 deletions integrationtest/backend/lucene/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

<properties>
<surefire.module>lucene</surefire.module>
<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
5 changes: 5 additions & 0 deletions integrationtest/backend/tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
<name>Hibernate Search ITs - Backend TCK</name>
<description>Hibernate Search backend TCK, including tests for every feature common to all the backends</description>

<properties>
<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate.search</groupId>
Expand Down
1 change: 1 addition & 0 deletions integrationtest/mapper/orm-jakarta-batch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<surefire.jvm.args.module>
${test.elasticsearch.connection.jvm.args}
${test.weld.jvm.args}
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>

<failsafe.lucene-jbatch.reportsDirectory>${project.build.directory}/failsafe-reports/lucene-jbatch</failsafe.lucene-jbatch.reportsDirectory>
Expand Down
3 changes: 3 additions & 0 deletions integrationtest/mapper/orm-realbackend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<failsafe.jvm.args.jacoco.lucene></failsafe.jvm.args.jacoco.lucene>
<failsafe.jvm.args.jacoco.elasticsearch></failsafe.jvm.args.jacoco.elasticsearch>
<failsafe.jvm.args.jacoco.multiplebackends></failsafe.jvm.args.jacoco.multiplebackends>
<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
6 changes: 6 additions & 0 deletions integrationtest/mapper/orm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
<name>Hibernate Search ITs - ORM</name>
<description>Hibernate Search integration tests for the Hibernate ORM integration</description>

<properties>
<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
<dependency>
<groupId>org.hibernate.search</groupId>
Expand Down
4 changes: 4 additions & 0 deletions integrationtest/mapper/pojo-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

<properties>
<maven.compiler.testSources.noParameterCompilation.skip>false</maven.compiler.testSources.noParameterCompilation.skip>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions lucene-next/integrationtest/backend/lucene/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<transform.original.pathFromRoot>integrationtest/backend/lucene</transform.original.pathFromRoot>

<surefire.module>lucene</surefire.module>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
1 change: 1 addition & 0 deletions lucene-next/integrationtest/mapper/orm-jakarta-batch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<surefire.jvm.args.module>
${test.elasticsearch.connection.jvm.args}
${test.weld.jvm.args}
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>

<failsafe.lucene-jbatch.reportsDirectory>${project.build.directory}/failsafe-reports/lucene-jbatch</failsafe.lucene-jbatch.reportsDirectory>
Expand Down
3 changes: 3 additions & 0 deletions lucene-next/integrationtest/mapper/orm-realbackend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<failsafe.multiplebackends.summaryFile>${failsafe.multiplebackends.reportsDirectory}/failsafe-summary.xml</failsafe.multiplebackends.summaryFile>
<failsafe.jvm.args.jacoco.lucene></failsafe.jvm.args.jacoco.lucene>
<failsafe.jvm.args.jacoco.multiplebackends></failsafe.jvm.args.jacoco.multiplebackends>
<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions mapper/orm-outbox-polling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<java.module.name>org.hibernate.search.mapper.orm.outboxpolling</java.module.name>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions mapper/orm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<java.module.name>org.hibernate.search.mapper.orm</java.module.name>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions mapper/pojo-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<!-- This is a publicly distributed module that should be published: -->
<deploy.skip>false</deploy.skip>
<java.module.name>org.hibernate.search.mapper.pojo</java.module.name>

<surefire.jvm.args.module>
${test.mockito.agent.jvm.args}
</surefire.jvm.args.module>
</properties>

<dependencies>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,13 @@
<!-- Set empty default values to avoid Maven leaving property references (${...}) when it doesn't find a value -->

<surefire.jvm.args.memory>-Xmx512m -Xms128m</surefire.jvm.args.memory>
<surefire.jvm.args.misc>-Djdk.attach.allowAttachSelf=true</surefire.jvm.args.misc>
<surefire.jvm.args.misc>-Djdk.attach.allowAttachSelf=false</surefire.jvm.args.misc>
<!-- JVM args to be customized depending on the Java version -->
<surefire.jvm.args.java-version></surefire.jvm.args.java-version>
<!-- JVM args generated by JaCoCo -->
<surefire.jvm.args.jacoco></surefire.jvm.args.jacoco>
<failsafe.jvm.args.jacoco></failsafe.jvm.args.jacoco>

<!-- JVM args to be customized by each Maven module -->
<surefire.jvm.args.module></surefire.jvm.args.module>
<surefire.jvm.args.module.add-opens></surefire.jvm.args.module.add-opens>
Expand Down