From ef19659cb67ed087878c1d860df7b009c82855d5 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 3 May 2024 20:26:05 +0200
Subject: [PATCH] [ci] Only run PMD twice instead of three times during build

pmd:check executes implicitly pmd:pmd, but with
the default configuration. For execution
"pmd-test" this means, we called pmd:pmd twice:
Once within "pmd-test" to check test code and
once more via pmd:check, but against the main code.

Skipping now the default configuration always
and explicitly call pmd:pmd in the two
executions.

Thanks @uhafner for the idea.
---
 pom.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3bab7a3e4..e5b7e66827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -506,9 +506,22 @@
                             <id>pmd-main</id>
                             <phase>verify</phase>
                             <goals>
+                                <goal>pmd</goal>
                                 <goal>check</goal>
+                                <goal>cpd</goal>
                                 <goal>cpd-check</goal>
                             </goals>
+                            <configuration>
+                                <skip>${pmd.skip}</skip>
+                                <minimumTokens>100</minimumTokens>
+                                <rulesets>
+                                    <ruleset>/net/sourceforge/pmd/pmd-dogfood-config.xml</ruleset>
+                                </rulesets>
+                                <excludeRoots>
+                                    <excludeRoot>target/generated-sources/javacc</excludeRoot>
+                                    <excludeRoot>target/generated-sources/antlr4</excludeRoot>
+                                </excludeRoots>
+                            </configuration>
                         </execution>
                         <execution>
                             <id>pmd-test</id>
@@ -518,6 +531,7 @@
                                 <goal>check</goal>
                             </goals>
                             <configuration>
+                                <skip>${pmd.skip}</skip>
                                 <targetDirectory>${project.build.directory}/pmdTest/</targetDirectory>
                                 <includeTests>true</includeTests>
                                 <rulesets>
@@ -528,19 +542,15 @@
                     </executions>
                     <configuration>
                         <linkXRef>false</linkXRef>
-                        <minimumTokens>100</minimumTokens>
                         <targetJdk>1.${java.version}</targetJdk>
-                        <rulesets>
-                            <ruleset>/net/sourceforge/pmd/pmd-dogfood-config.xml</ruleset>
-                        </rulesets>
-                        <excludeRoots>
-                            <excludeRoot>target/generated-sources/javacc</excludeRoot>
-                            <excludeRoot>target/generated-sources/antlr4</excludeRoot>
-                        </excludeRoots>
                         <skipPmdError>false</skipPmdError>
                         <failurePriority>2</failurePriority>
                         <failOnViolation>true</failOnViolation>
                         <printFailingErrors>true</printFailingErrors>
+                        <!-- Skip the default pmd executions, which is triggered by pmd:check and avoid
+                             unnecessary pmd analysis of the main code.
+                             We use executions pmd-main and pmd-test instead and explicitly run pmd:pmd. -->
+                        <skip>true</skip>
                     </configuration>
                     <dependencies>
                         <!-- Note: we can't use a property for the version here due to https://issues.apache.org/jira/browse/MRELEASE-932 -->