Merge pull request dsldevkit#1021 from rubenporras/upgradePMD

build: upgrade to PMD 7.7
ava-fred · Oct 29, 2024 · 2840bec · 2840bec
2 parents 1723b47 + 0f81008
commit 2840bec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -13,7 +13,7 @@ jobs:
         uses: pmd/[email protected]
         id: pmd
         with:
-          version: '7.5.0'
+          version: '7.7.0'
           rulesets: 'ddk-configuration/pmd/ruleset.xml'
           analyzeModifiedFilesOnly: false
       - name: Fail build if there are violations

diff --git a/ddk-configuration/pmd/ruleset.xml b/ddk-configuration/pmd/ruleset.xml
@@ -73,15 +73,16 @@
     <exclude name="AccessorMethodGeneration"/>
     <exclude name="AvoidReassigningParameters"/>
     <exclude name="UnusedPrivateMethod"/><!-- false positives-->
-    <exclude name="DefaultLabelNotLastInSwitchStmt"/>
+    <exclude name="DefaultLabelNotLastInSwitch"/>
     <exclude name="ForLoopCanBeForeach"/>
     <exclude name="GuardLogStatement"/><!--TODO-->
-    <exclude name="JUnitTestContainsTooManyAsserts"/><!--New after PMD 5.3 upgrade, limitation to 1 assert not sensible, would need customization, disabled for the time being-->
-    <exclude name="JUnitTestsShouldIncludeAssert"/>
-    <exclude name="JUnit4TestShouldUseAfterAnnotation"/><!--Checkstyle-->
-    <exclude name="JUnit4TestShouldUseBeforeAnnotation"/><!--Checkstyle-->
-    <exclude name="JUnit4TestShouldUseTestAnnotation"/>
-    <exclude name="SwitchStmtsShouldHaveDefault"/>
+    <exclude name="UnitTestAssertionsShouldIncludeMessage"/>
+    <exclude name="UnitTestContainsTooManyAsserts"/><!--New after PMD 5.3 upgrade, limitation to 1 assert not sensible, would need customization, disabled for the time being-->
+    <exclude name="UnitTestShouldIncludeAssert"/>
+    <exclude name="UnitTestShouldUseAfterAnnotation"/><!--Checkstyle-->
+    <exclude name="UnitTestShouldUseBeforeAnnotation"/><!--Checkstyle-->
+    <exclude name="UnitTestShouldUseTestAnnotation"/>
+    <exclude name="NonExhaustiveSwitch"/>
     <exclude name="PreserveStackTrace"/><!--TODO-->
     <exclude name="UnusedLocalVariable"/><!--Checkstyle-->
     <exclude name="UseTryWithResources"/><!--TODO-->
@@ -125,7 +126,7 @@
     <exclude name="ConsecutiveLiteralAppends"/>
     <exclude name="OptimizableToArrayCall"/>
     <exclude name="RedundantFieldInitializer"/><!--Checkstyle-->
-    <exclude name="TooFewBranchesForASwitchStatement"/>
+    <exclude name="TooFewBranchesForSwitch"/>
   </rule>
 
 </ruleset>
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
@@ -53,7 +53,7 @@
     <spotbugs.plugin.version>4.8.6.5</spotbugs.plugin.version>
     <spotbugs.version>4.8.6</spotbugs.version>
     <pmd.plugin.version>3.25.0</pmd.plugin.version>
-    <pmd.version>7.6.0</pmd.version>
+    <pmd.version>7.7.0</pmd.version>
     <tycho.version>4.0.9</tycho.version>
     <xtend.version>2.36.0</xtend.version>
   </properties>