From 2dfdbed8d64fc8b7eb7abb4f6d56fd74852e2b72 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sun, 11 Aug 2024 19:57:09 +0200
Subject: [PATCH] Upgrade PMD to 7.4.0 (#468)

Upgrades PMD from 7.0.0 to 7.4.0

For release notes, see:

* https://docs.pmd-code.org/pmd-doc-7.4.0/pmd_release_notes.html
* https://docs.pmd-code.org/pmd-doc-7.4.0/pmd_release_notes_old.html

Signed-off-by: Wouter Born <github@maindrain.net>
---
 docs/maven-plugin.md                                       | 2 +-
 pom.xml                                                    | 7 +------
 .../java/org/openhab/tools/analysis/tools/PmdChecker.java  | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/docs/maven-plugin.md b/docs/maven-plugin.md
index cccbf138..10e88994 100644
--- a/docs/maven-plugin.md
+++ b/docs/maven-plugin.md
@@ -87,7 +87,7 @@ Parameters:
 | ------ | ------| -------- |
 | **pmdRuleset** | String | Relative path of the XML configuration to use. If not set the default ruleset file will be used |
 | **pmdFilter** | String | Relative path of a suppression.properties file that lists classes and rules to be excluded from failures. If not set no classes and no rules will be excluded |
-| **maven.pmd.version** | String | The version of the maven-pmd-plugin that will be used (Default value is **3.21.2**)|
+| **maven.pmd.version** | String | The version of the maven-pmd-plugin that will be used (Default value is **3.24.0**)|
 | **pmdPlugins** | List<Dependency> | A list with artifacts that contain additional checks for PMD |
 
 ### sat-plugin:checkstyle
diff --git a/pom.xml b/pom.xml
index 9de00718..4c60a88f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <commons.lang3.version>3.12.0</commons.lang3.version>
     <mockito.version>4.10.0</mockito.version>
     <maven.resources.version>3.3.0</maven.resources.version>
-    <pmd.version>7.0.0</pmd.version>
+    <pmd.version>7.4.0</pmd.version>
     <checkstyle.version>10.14.0</checkstyle.version>
     <spotbugs.version>4.8.6</spotbugs.version>
     <maven.core.version>3.6.0</maven.core.version>
@@ -93,11 +93,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>net.sourceforge.pmd</groupId>
-      <artifactId>pmd-compat6</artifactId>
-      <version>7.0.0</version>
-    </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
diff --git a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/PmdChecker.java b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/PmdChecker.java
index 2b3cba70..cf21ea2c 100644
--- a/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/PmdChecker.java
+++ b/sat-plugin/src/main/java/org/openhab/tools/analysis/tools/PmdChecker.java
@@ -60,7 +60,7 @@ public class PmdChecker extends AbstractChecker {
     /**
      * The version of the maven-pmd-plugin that will be used
      */
-    @Parameter(property = "maven.pmd.version", defaultValue = "3.21.2")
+    @Parameter(property = "maven.pmd.version", defaultValue = "3.24.0")
     private String mavenPmdVersion;
 
     /**
@@ -69,7 +69,7 @@ public class PmdChecker extends AbstractChecker {
     @Parameter
     private List<Dependency> pmdPlugins = new ArrayList<>();
 
-    private static final String PMD_VERSION = "7.0.0";
+    private static final String PMD_VERSION = "7.4.0";
     /**
      * Location of the properties files that contains configuration options for the maven-pmd-plugin
      */