HSEARCH-4395 Upgrade JQAssistant to the 2.0 series

hibernate · Jul 3, 2023 · 921d467 · 921d467
1 parent 20003b5
commit 921d467
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -1 +1 @@
---add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED
diff --git a/build/jqassistant/.jqassistant.yml b/build/jqassistant/.jqassistant.yml
@@ -0,0 +1,20 @@
+jqassistant:
+  maven:
+    # Force the module where 'mvn' is being executed to be used as root module. The database will be created in this module and contain all information of the reactor. Rules will be read from the rules folder of this module.
+    #
+    # jqassistant.maven.use-execution-root-as-project-root: true|false
+    use-execution-root-as-project-root: true
+    # Re-use store instances across all modules of the Maven reactor. Can be set to false for mitigating problems in specific setups,
+    # the jQAssistant Maven plugin will display an according hint when this is necessary.
+    #
+    # jqassistant.maven.reuse-store: true|false
+    reuse-store: true
+  analyze:
+    rule:
+      # Note: we cannot put the rules at the same level as our .jqassistant.yml itself,
+      # since JQAssistant will try reading it as a rule file and will fail.
+      directory: build/jqassistant/rules
+    report:
+      warn-on-severity: INFO
+      fail-on-severity: MAJOR
+      continue-on-failure: false
diff --git a/build/jqassistant/rules.xml → build/jqassistant/rules/rules.xml b/build/jqassistant/rules.xml → build/jqassistant/rules/rules.xml
@@ -295,7 +295,7 @@
         <cypher><![CDATA[
             // supertypes
             MATCH
-                (type:Type:Public)-[:EXTENDS|:IMPLEMENTS]->(superType:Type:Impl)
+                (type:Type:Public)-[:EXTENDS|IMPLEMENTS]->(superType:Type:Impl)
             RETURN
                 type AS ExposingSite, superType.fqn AS ExposedType
 
@@ -372,7 +372,7 @@
         <cypher><![CDATA[
             // supertypes
             MATCH
-                (type:Type:Api)-[:EXTENDS|:IMPLEMENTS]->(superType:Type:Spi)
+                (type:Type:Api)-[:EXTENDS|IMPLEMENTS]->(superType:Type:Spi)
             RETURN
                 type AS ExposingSite, superType AS ExposedType
 
@@ -423,7 +423,7 @@
         <cypher><![CDATA[
             // supertypes
             MATCH
-                (type:Type:Api)-[:EXTENDS|:IMPLEMENTS*]->(superType:Type)
+                (type:Type:Api)-[:EXTENDS|IMPLEMENTS*]->(superType:Type)
             WHERE
                 superType.fqn = "java.util.concurrent.CompletableFuture"
             RETURN
@@ -433,7 +433,7 @@
             UNION ALL
             MATCH
                 (type:Type:Api)-[:DECLARES]->(method)-[:RETURNS]->(returnType:Type)
-                        -[:EXTENDS|:IMPLEMENTS*0..]->(returnTypeOrSuperType:Type)
+                        -[:EXTENDS|IMPLEMENTS*0..]->(returnTypeOrSuperType:Type)
             WHERE
                 (method.visibility="public" OR method.visibility="protected")
                 AND returnTypeOrSuperType.fqn = "java.util.concurrent.CompletableFuture"
@@ -444,7 +444,7 @@
             UNION ALL
             MATCH
                 (type:Type:Api)-[:DECLARES]->(method)-[:HAS]->(parameter)-[:OF_TYPE]->(parameterType:Type)
-                        -[:EXTENDS|:IMPLEMENTS*0..]->(parameterTypeOrSuperType:Type)
+                        -[:EXTENDS|IMPLEMENTS*0..]->(parameterTypeOrSuperType:Type)
             WHERE
                 (method.visibility="public" OR method.visibility="protected")
                 AND parameterTypeOrSuperType.fqn = "java.util.concurrent.CompletableFuture"
@@ -455,7 +455,7 @@
             UNION ALL
             MATCH
                 (type:Type:Api)-[:DECLARES]->(field)-[:OF_TYPE]->(fieldType:Type)
-                        -[:EXTENDS|:IMPLEMENTS*0..]->(fieldTypeOrSuperType:Type)
+                        -[:EXTENDS|IMPLEMENTS*0..]->(fieldTypeOrSuperType:Type)
             WHERE
                 (field.visibility="public" OR field.visibility="protected")
                 AND fieldTypeOrSuperType.fqn = "java.util.concurrent.CompletableFuture"

diff --git a/pom.xml b/pom.xml
@@ -368,7 +368,7 @@
         <version.surefire.plugin>3.0.0-M8</version.surefire.plugin>
         <version.surefire.plugin.java-version.asm>9.5</version.surefire.plugin.java-version.asm>
         <version.jacoco.plugin>0.8.8</version.jacoco.plugin>
-        <version.com.buschmais.jqassistant.plugin>1.12.0</version.com.buschmais.jqassistant.plugin>
+        <version.com.buschmais.jqassistant.plugin>2.0.3</version.com.buschmais.jqassistant.plugin>
         <version.docker.maven.plugin>0.40.2</version.docker.maven.plugin>
         <version.moditect.plugin>1.0.0.RC2</version.moditect.plugin>
         <version.sonar.plugin>3.9.1.2184</version.sonar.plugin>
@@ -2891,9 +2891,10 @@
                         <artifactId>jqassistant-maven-plugin</artifactId>
                         <version>${version.com.buschmais.jqassistant.plugin}</version>
                         <configuration>
-                            <rulesDirectory>build/jqassistant</rulesDirectory>
-                            <warnOnSeverity>INFO</warnOnSeverity>
-                            <failOnSeverity>MAJOR</failOnSeverity>
+                            <configurationLocations>
+                                <!-- Any JQAssistant configurations go in this yml file:  -->
+                                <configurationLocation>build/jqassistant/.jqassistant.yml</configurationLocation>
+                            </configurationLocations>
                         </configuration>
                         <executions>
                             <execution>