From 13d70a20233e220232157ebdeb79bd9340eb3a83 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Wed, 14 May 2025 10:51:36 -0700
Subject: [PATCH] [SPARK-52137] Upgrade `pmd` to 7.13.0

---
 .../spark/k8s/operator/utils/DocTable.java    |  3 +--
 config/pmd/ruleset.xml                        | 19 +++++++++++++++++--
 gradle/libs.versions.toml                     |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/build-tools/docs-utils/src/main/java/org/apache/spark/k8s/operator/utils/DocTable.java b/build-tools/docs-utils/src/main/java/org/apache/spark/k8s/operator/utils/DocTable.java
index 73e0597d..ab514879 100644
--- a/build-tools/docs-utils/src/main/java/org/apache/spark/k8s/operator/utils/DocTable.java
+++ b/build-tools/docs-utils/src/main/java/org/apache/spark/k8s/operator/utils/DocTable.java
@@ -57,8 +57,7 @@ public void flush(PrintWriter writer) {
   private String joinRow(List<String> elements) {
     StringBuilder stringBuilder = new StringBuilder(ROW_SEPARATOR);
     for (String element : elements) {
-      stringBuilder.append(element);
-      stringBuilder.append(ROW_SEPARATOR);
+      stringBuilder.append(element).append(ROW_SEPARATOR);
     }
     if (elements.size() < columns) {
       // Append empty cells to end if needed
diff --git a/config/pmd/ruleset.xml b/config/pmd/ruleset.xml
index 3f754857..0f97d1b3 100644
--- a/config/pmd/ruleset.xml
+++ b/config/pmd/ruleset.xml
@@ -22,8 +22,13 @@
     Apache Spark Kubernetes Operator Ruleset
   </description>
   <rule ref="category/java/bestpractices.xml">
-    <exclude name="JUnitAssertionsShouldIncludeMessage" />
-    <exclude name="JUnitTestContainsTooManyAsserts" />
+    <exclude name="GuardLogStatement" />
+    <exclude name="ImplicitFunctionalInterface" />
+    <exclude name="UnitTestAssertionsShouldIncludeMessage" />
+    <exclude name="UnitTestContainsTooManyAsserts" />
+    <exclude name="UnitTestShouldIncludeAssert" />
+    <exclude name="UnusedLocalVariable" />
+    <exclude name="LooseCoupling" />
   </rule>
   <rule ref="category/java/codestyle.xml">
     <exclude name="AtLeastOneConstructor" />
@@ -36,16 +41,24 @@
     <exclude name="OnlyOneReturn" />
     <exclude name="ShortVariable" />
     <exclude name="TooManyStaticImports" />
+    <exclude name="UnnecessaryCast" />
+    <exclude name="UnnecessaryFullyQualifiedName" />
+    <exclude name="UseExplicitTypes" />
     <exclude name="UseUnderscoresInNumericLiterals" />
   </rule>
   <rule ref="category/java/design.xml">
     <exclude name="AbstractClassWithoutAnyMethod" />
     <exclude name="AvoidCatchingGenericException" />
+    <exclude name="ClassWithOnlyPrivateConstructorsShouldBeFinal" />
     <exclude name="CognitiveComplexity" />
+    <exclude name="CouplingBetweenObjects" />
     <exclude name="CyclomaticComplexity" />
+    <exclude name="DataClass" />
     <exclude name="ExcessiveImports" />
+    <exclude name="FinalFieldCouldBeStatic" />
     <exclude name="LawOfDemeter" />
     <exclude name="NPathComplexity" />
+    <exclude name="SimplifyBooleanReturns" />
     <exclude name="TooManyMethods" />
   </rule>
   <rule ref="category/java/documentation.xml">
@@ -67,6 +80,7 @@
     <exclude name="UseProperClassLoader" />
   </rule>
   <rule ref="category/java/multithreading.xml">
+    <exclude name="AvoidSynchronizedStatement" />
     <exclude name="DoNotUseThreads" />
     <exclude name="UseConcurrentHashMap" />
   </rule>
@@ -74,6 +88,7 @@
     <exclude name="AvoidFileStream" />
     <exclude name="AvoidInstantiatingObjectsInLoops" />
     <exclude name="RedundantFieldInitializer" />
+    <exclude name="UseArraysAsList" />
   </rule>
   <rule ref="category/java/security.xml"/>
   <!-- exclude on generated files -->
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c118f67e..47a89b4d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ mockito = "5.17.0"
 
 # Build Analysis
 checkstyle = "10.23.1"
-pmd = "6.55.0"
+pmd = "7.13.0"
 spotbugs-tool = "4.8.6"
 spotbugs-plugin = "6.0.17"
 spotless-plugin = "6.25.0"