From 225cc049dcce1ddefeb9e989ba5bec5da6af41aa Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Thu, 12 Oct 2023 18:23:31 +0200
Subject: [PATCH] HSEARCH-4989 Use a different property to skip JQAssistant
 analysis of some modules

---
 build/config/pom.xml                                    | 2 +-
 build/enforcer/pom.xml                                  | 2 +-
 build/reports/pom.xml                                   | 6 ------
 integrationtest/v5migrationhelper/engine/pom.xml        | 2 +-
 integrationtest/v5migrationhelper/orm/pom.xml           | 2 +-
 util/internal/integrationtest/v5migrationhelper/pom.xml | 2 +-
 v5migrationhelper/engine/pom.xml                        | 2 +-
 v5migrationhelper/orm/pom.xml                           | 2 +-
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/build/config/pom.xml b/build/config/pom.xml
index 2f4cc08afa6..b042349f886 100644
--- a/build/config/pom.xml
+++ b/build/config/pom.xml
@@ -19,7 +19,7 @@
     <description>Hibernate Search common build configuration files</description>
 
     <properties>
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
 
         <!--
             This module generates the rules used in the Checkstyle and ForbiddenAPIs plugins,
diff --git a/build/enforcer/pom.xml b/build/enforcer/pom.xml
index 3ef2e1883ee..7fb33f33585 100644
--- a/build/enforcer/pom.xml
+++ b/build/enforcer/pom.xml
@@ -30,7 +30,7 @@
         <format.skip>true</format.skip>
 
         <deploy.skip>true</deploy.skip>
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
     </properties>
 
     <dependencies>
diff --git a/build/reports/pom.xml b/build/reports/pom.xml
index a0f0473ad22..f05a670ba25 100644
--- a/build/reports/pom.xml
+++ b/build/reports/pom.xml
@@ -21,12 +21,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <!--
-             Do NOT skip jqassistant: we want to execute analysis here so as to fail the build if anything is wrong.
-             Reminder: jqassistant only executes analysis in the last module of the build,
-             so if we skip it in the last module, it just won't execute analysis... ever.
-         -->
-        <jqassistant.skip>false</jqassistant.skip>
         <!--
         Disable the dependency convergence rule, because the dependencies of various integration tests do not converge
         -->
diff --git a/integrationtest/v5migrationhelper/engine/pom.xml b/integrationtest/v5migrationhelper/engine/pom.xml
index fb440121b3e..6d493bade79 100755
--- a/integrationtest/v5migrationhelper/engine/pom.xml
+++ b/integrationtest/v5migrationhelper/engine/pom.xml
@@ -21,7 +21,7 @@
 
     <properties>
         <!-- This is based on legacy code and there are plenty of problems that we don't care to fix -->
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
         <forbiddenapis.skip>true</forbiddenapis.skip>
         <sonar.skip>true</sonar.skip>
     </properties>
diff --git a/integrationtest/v5migrationhelper/orm/pom.xml b/integrationtest/v5migrationhelper/orm/pom.xml
index 4eb01e58a9b..a2cef0402d2 100755
--- a/integrationtest/v5migrationhelper/orm/pom.xml
+++ b/integrationtest/v5migrationhelper/orm/pom.xml
@@ -21,7 +21,7 @@
 
     <properties>
         <!-- This is based on legacy code and there are plenty of problems that we don't care to fix -->
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
         <forbiddenapis.skip>true</forbiddenapis.skip>
         <sonar.skip>true</sonar.skip>
 
diff --git a/util/internal/integrationtest/v5migrationhelper/pom.xml b/util/internal/integrationtest/v5migrationhelper/pom.xml
index 6eed66a6bce..590ff3d3378 100644
--- a/util/internal/integrationtest/v5migrationhelper/pom.xml
+++ b/util/internal/integrationtest/v5migrationhelper/pom.xml
@@ -21,7 +21,7 @@
 
     <properties>
         <!-- This is based on legacy code and there are plenty of problems that we don't care to fix -->
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
         <forbiddenapis.skip>true</forbiddenapis.skip>
         <sonar.skip>true</sonar.skip>
     </properties>
diff --git a/v5migrationhelper/engine/pom.xml b/v5migrationhelper/engine/pom.xml
index 54607169336..6b72734ca9e 100644
--- a/v5migrationhelper/engine/pom.xml
+++ b/v5migrationhelper/engine/pom.xml
@@ -25,7 +25,7 @@
         <java.module.name>org.hibernate.search.v5migrationhelper.engine</java.module.name>
 
         <!-- This is based on legacy code and there are plenty of problems that we don't care to fix -->
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
         <forbiddenapis.skip>true</forbiddenapis.skip>
         <sonar.skip>true</sonar.skip>
     </properties>
diff --git a/v5migrationhelper/orm/pom.xml b/v5migrationhelper/orm/pom.xml
index f45e5d87337..531ec60bf90 100644
--- a/v5migrationhelper/orm/pom.xml
+++ b/v5migrationhelper/orm/pom.xml
@@ -25,7 +25,7 @@
         <java.module.name>org.hibernate.search.v5migrationhelper.orm</java.module.name>
 
         <!-- This is based on legacy code and there are plenty of problems that we don't care to fix -->
-        <jqassistant.skip>true</jqassistant.skip>
+        <jqassistant.maven.module.skip>true</jqassistant.maven.module.skip>
         <forbiddenapis.skip>true</forbiddenapis.skip>
         <sonar.skip>true</sonar.skip>
     </properties>