From 2f444114bc3871755d3709c3cbf55ef6add52085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Tue, 26 Jul 2022 09:43:34 +0200
Subject: [PATCH] HSEARCH-4649 Make sure orm6/jakarta test reports have
 distinct test report names

Otherwise they get confused with their "vanilla" counterpart.
---
 jakarta/parents/integrationtest/pom.xml | 2 ++
 jakarta/parents/internal/pom.xml        | 2 ++
 jakarta/parents/public/pom.xml          | 2 ++
 orm6/parents/integrationtest/pom.xml    | 2 ++
 orm6/parents/internal/pom.xml           | 2 ++
 orm6/parents/public/pom.xml             | 2 ++
 pom.xml                                 | 5 ++++-
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/jakarta/parents/integrationtest/pom.xml b/jakarta/parents/integrationtest/pom.xml
index 79a1b7f66a8..7f7cb55da15 100644
--- a/jakarta/parents/integrationtest/pom.xml
+++ b/jakarta/parents/integrationtest/pom.xml
@@ -21,6 +21,8 @@
     <description>Common build configuration for all Jakarta EE integration test artifacts (including documentation)</description>
 
     <properties>
+        <surefire.integration>jakarta</surefire.integration>
+
         <!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
         <jqassistant.skip>true</jqassistant.skip>
         <!-- Prevent these modules from artificially affecting Sonar metrics -->
diff --git a/jakarta/parents/internal/pom.xml b/jakarta/parents/internal/pom.xml
index 27feffa20f2..4da5fcc59ce 100644
--- a/jakarta/parents/internal/pom.xml
+++ b/jakarta/parents/internal/pom.xml
@@ -21,6 +21,8 @@
     <description>Common build configuration for all internal (non-published) artifacts - Jakarta EE version</description>
 
     <properties>
+        <surefire.integration>jakarta</surefire.integration>
+
         <!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
         <jqassistant.skip>true</jqassistant.skip>
         <!-- Prevent these modules from artificially affecting Sonar metrics -->
diff --git a/jakarta/parents/public/pom.xml b/jakarta/parents/public/pom.xml
index a1f4cf09d24..b64710121ed 100644
--- a/jakarta/parents/public/pom.xml
+++ b/jakarta/parents/public/pom.xml
@@ -21,6 +21,8 @@
     <description>Common build configuration for all Jakarta EE public artifacts</description>
 
     <properties>
+        <surefire.integration>jakarta</surefire.integration>
+
         <!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
         <jqassistant.skip>true</jqassistant.skip>
         <!-- Prevent these modules from artificially affecting Sonar metrics -->
diff --git a/orm6/parents/integrationtest/pom.xml b/orm6/parents/integrationtest/pom.xml
index e5f3d4c425e..9846c41051d 100644
--- a/orm6/parents/integrationtest/pom.xml
+++ b/orm6/parents/integrationtest/pom.xml
@@ -21,6 +21,8 @@
     <description>Common build configuration for all ORM6 integration test artifacts (including documentation)</description>
 
     <properties>
+        <surefire.integration>orm6</surefire.integration>
+
         <!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
         <jqassistant.skip>true</jqassistant.skip>
         <!-- Forbiddenapis fails when some forbidden methods are not found, and some forbidden methods were removed in ORM 6 -->
diff --git a/orm6/parents/internal/pom.xml b/orm6/parents/internal/pom.xml
index 7a163bb01b3..7d57f065216 100644
--- a/orm6/parents/internal/pom.xml
+++ b/orm6/parents/internal/pom.xml
@@ -21,6 +21,8 @@
     <description>Common build configuration for all internal (non-published) artifacts - ORM6 version</description>
 
     <properties>
+        <surefire.integration>orm6</surefire.integration>
+
         <!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
         <jqassistant.skip>true</jqassistant.skip>
         <!-- Forbiddenapis fails when some forbidden methods are not found, and some forbidden methods were removed in ORM 6 -->
diff --git a/orm6/parents/public/pom.xml b/orm6/parents/public/pom.xml
index 0093ada0ecf..3e2ffe34837 100644
--- a/orm6/parents/public/pom.xml
+++ b/orm6/parents/public/pom.xml
@@ -21,6 +21,8 @@
     <description>Common build configuration for all ORM6 public artifacts</description>
 
     <properties>
+        <surefire.integration>orm6</surefire.integration>
+
         <!-- JQAssistant does not seem to work correctly on these artifacts for some reason -->
         <jqassistant.skip>true</jqassistant.skip>
         <!-- Forbiddenapis fails when some forbidden methods are not found, and some forbidden methods were removed in ORM 6 -->
diff --git a/pom.xml b/pom.xml
index 00757b84bfb..f88995d5399 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,12 +550,15 @@
         <failsafe.spring.skip>${skipITs}</failsafe.spring.skip>
 
         <!-- This allows us to distinguish between multiple executions of the same test in test reports. -->
-        <surefire.reportNameSuffix>${surefire.module}-${surefire.environment}</surefire.reportNameSuffix>
+        <surefire.reportNameSuffix>${surefire.module}-${surefire.integration}-${surefire.environment}</surefire.reportNameSuffix>
         <!-- This should be set from the command line by CI jobs that execute the same tests in multiple environments -->
         <surefire.environment>default</surefire.environment>
         <!-- This should be set in modules that re-execute tests imported from a dependency (using <dependenciesToScan>)
              to differentiate multiple executions of the same tests in multiple modules. -->
         <surefire.module>default</surefire.module>
+        <!-- This should be set in modules that transform Hibernate Search code for a different integration
+             (Jakarta EE, ORM 6, ...). -->
+        <surefire.integration>default</surefire.integration>
 
         <!-- Containers executions tests properties -->
         <test.containers.run.skip>false</test.containers.run.skip>