From 0e14bade990c18f2d2c31a6a4b90be08882e2343 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Tue, 3 Feb 2026 15:40:26 +0100
Subject: [PATCH 1/2] maven plugin updates

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6985108302df..d617289f2aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,10 @@
         <!-- Plugins versions -->
         <cs.antrun-plugin.version>1.8</cs.antrun-plugin.version>
         <cs.builder-helper-plugin.version>3.0.0</cs.builder-helper-plugin.version>
-        <cs.checkstyle-plugin.version>3.1.0</cs.checkstyle-plugin.version>
+        <cs.checkstyle-plugin.version>3.6.0</cs.checkstyle-plugin.version>
         <cs.jacoco-plugin.version>0.8.11</cs.jacoco-plugin.version>
         <cs.compiler-plugin.version>3.8.1</cs.compiler-plugin.version>
-        <cs.dependency-plugin.version>3.1.1</cs.dependency-plugin.version>
+        <cs.dependency-plugin.version>3.9.0</cs.dependency-plugin.version>
         <cs.failsafe-plugin.version>2.22.2</cs.failsafe-plugin.version>
         <cs.spotbugs.version>3.1.12</cs.spotbugs.version>
         <cs.spotbugs-maven-plugin.version>3.1.12.2</cs.spotbugs-maven-plugin.version>
@@ -76,7 +76,7 @@
         <cs.owasp.dependency-checker-plugin.version>7.4.4</cs.owasp.dependency-checker-plugin.version>
         <cs.release-plugin.version>2.5.3</cs.release-plugin.version>
         <cs.resources-plugin.version>3.1.0</cs.resources-plugin.version>
-        <cs.site-plugin.version>3.8.2</cs.site-plugin.version>
+        <cs.site-plugin.version>3.21.0</cs.site-plugin.version>
         <cs.surefire-plugin.version>2.22.2</cs.surefire-plugin.version>
         <cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version>
         <cs.exec-maven-plugin.version>3.2.0</cs.exec-maven-plugin.version>

From f319dc4c6bf8d9d4e72c5315021dbb9ff416f73a Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Tue, 3 Feb 2026 17:01:39 +0100
Subject: [PATCH 2/2] pmd update/-grade

---
 pom.xml                                       |  2 +-
 .../src/main/resources/cloud-pmd.xml          | 53 +++++++++----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index d617289f2aab..e57d6dfc46af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <cs.spotbugs.version>3.1.12</cs.spotbugs.version>
         <cs.spotbugs-maven-plugin.version>3.1.12.2</cs.spotbugs-maven-plugin.version>
         <cs.jar-plugin.version>3.2.0</cs.jar-plugin.version>
-        <cs.pmd-plugin.version>3.12.0</cs.pmd-plugin.version>
+        <cs.pmd-plugin.version>3.28.0</cs.pmd-plugin.version>
         <cs.project-info-plugin.version>3.0.0</cs.project-info-plugin.version>
         <cs.owasp.dependency-checker-plugin.version>7.4.4</cs.owasp.dependency-checker-plugin.version>
         <cs.release-plugin.version>2.5.3</cs.release-plugin.version>
diff --git a/tools/checkstyle/src/main/resources/cloud-pmd.xml b/tools/checkstyle/src/main/resources/cloud-pmd.xml
index 66a4ec08294a..78d394ea15eb 100644
--- a/tools/checkstyle/src/main/resources/cloud-pmd.xml
+++ b/tools/checkstyle/src/main/resources/cloud-pmd.xml
@@ -19,11 +19,8 @@
     under the License.
 
 -->
-<ruleset name="Maven Ruleset"
-  xmlns="http://pmd.sf.net/ruleset/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-  xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+<ruleset name="CloudStack PMD Ruleset"
+  xmlns="http://pmd.sourceforge.net/ruleset/2.0.0">
 
   <description>
     Ruleset that brings all the rulesets we want from the pmd jar, because
@@ -31,16 +28,16 @@
     to add our own future rulesets, if any.
   </description>
 
-  <rule ref="rulesets/java/basic.xml"/>
-  <rule ref="rulesets/java/braces.xml"/>
-  <rule ref="rulesets/java/clone.xml"/>
-  <rule ref="rulesets/java/codesize.xml"/>
-  <rule ref="rulesets/java/comments.xml">
+  <rule ref="category/java/basic.xml"/>
+  <rule ref="category/java/braces.xml"/>
+  <rule ref="category/java/clone.xml"/>
+  <rule ref="category/java/codesize.xml"/>
+  <rule ref="category/java/comments.xml">
     <!-- We shouldn't limit the number of lines in the header of a class -->
     <exclude name="CommentSize"/>
     <exclude name="CommentRequired" />
   </rule>
-  <rule ref="rulesets/java/controversial.xml">
+  <rule ref="category/java/controversial.xml">
     <!-- The rule is good, but is not properly applied. It forces you to statically declare it as ConcurrentHashMap -->
     <exclude name="UseConcurrentHashMap"/>
     <exclude name="CallSuperInConstructor"/>
@@ -50,35 +47,35 @@
     <exclude name="DataflowAnomalyAnalysis" />
     <exclude name="UseObjectForClearerAPI" />
   </rule>
-  <rule ref="rulesets/java/coupling.xml">
+  <rule ref="category/java/coupling.xml">
     <exclude name="ExcessiveImports" />
     <exclude name="LawOfDemeter"/>
   </rule>
-  <rule ref="rulesets/java/design.xml">
+  <rule ref="category/java/design.xml">
     <exclude name="ConstructorCallsOverridableMethod"/>
     <exclude name="AbstractClassWithoutAbstractMethod"/>
     <exclude name="AvoidSynchronizedAtMethodLevel"/>
   </rule>
-  <rule ref="rulesets/java/empty.xml"/>
-  <rule ref="rulesets/java/finalizers.xml"/>
-  <rule ref="rulesets/java/imports.xml"/>
-  <rule ref="rulesets/java/j2ee.xml"/>
-  <rule ref="rulesets/java/junit.xml"/>
-  <rule ref="rulesets/java/logging-java.xml"/>
-  <rule ref="rulesets/java/naming.xml">
+  <rule ref="category/java/empty.xml"/>
+  <rule ref="category/java/finalizers.xml"/>
+  <rule ref="category/java/imports.xml"/>
+  <rule ref="category/java/j2ee.xml"/>
+  <rule ref="category/java/junit.xml"/>
+  <rule ref="category/java/logging-java.xml"/>
+  <rule ref="category/java/naming.xml">
     <exclude name="ShortVariable"/>
     <exclude name="AbstractNaming"/>
   </rule>
-  <rule ref="rulesets/java/naming.xml/LongVariable">
+  <rule ref="category/java/naming.xml/LongVariable">
     <properties>
       <property name="minimum" value="32"/>
     </properties>
   </rule>
-  <rule ref="rulesets/java/optimizations.xml"/>
-  <rule ref="rulesets/java/strictexception.xml"/>
-  <rule ref="rulesets/java/strings.xml"/>
-  <rule ref="rulesets/java/sunsecure.xml"/>
-  <rule ref="rulesets/java/typeresolution.xml"/>
-  <rule ref="rulesets/java/unnecessary.xml"/>
-  <rule ref="rulesets/java/unusedcode.xml"/>
+  <rule ref="category/java/optimizations.xml"/>
+  <rule ref="category/java/strictexception.xml"/>
+  <rule ref="category/java/strings.xml"/>
+  <rule ref="category/java/sunsecure.xml"/>
+  <rule ref="category/java/typeresolution.xml"/>
+  <rule ref="category/java/unnecessary.xml"/>
+  <rule ref="category/java/unusedcode.xml"/>
 </ruleset>