From 310af9a6014f87c2ff963a0b3af4ab13da379f47 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 30 Sep 2023 11:53:47 -0700
Subject: [PATCH] Upgraded to PMD 7.0.0-rc4

---
 .idea/misc.xml                                | 26 +------------------
 .../rife/bld/extension/PmdOperationBuild.java |  6 ++---
 .../java/rife/bld/extension/PmdOperation.java | 23 +++++++++++-----
 .../rife/bld/extension/PmdOperationTest.java  | 11 +++++---
 4 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 333b5fb..43808e0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0">
@@ -8,33 +9,8 @@
     <pattern value="rife.bld.extension.PmdOperation" method="addInputPath" />
     <pattern value="rife.bld.extension.PmdOperation" method="addRelativizeRoot" />
     <pattern value="rife.bld.extension.PmdOperation" method="addRuleSet" />
-    <pattern value="rife.bld.extension.PmdOperation" method="cache" />
-    <pattern value="rife.bld.extension.PmdOperation" method="debug" />
-    <pattern value="rife.bld.extension.PmdOperation" method="defaultLanguage" />
-    <pattern value="rife.bld.extension.PmdOperation" method="encoding" />
-    <pattern value="rife.bld.extension.PmdOperation" method="failOnViolation" />
-    <pattern value="rife.bld.extension.PmdOperation" method="forceVersion" />
-    <pattern value="rife.bld.extension.PmdOperation" method="fromProject" />
-    <pattern value="rife.bld.extension.PmdOperation" method="ignoreFile" />
-    <pattern value="rife.bld.extension.PmdOperation" />
-    <pattern value="rife.bld.extension.PmdOperation" method="incrementalAnalysis" />
-    <pattern value="rife.bld.extension.PmdOperation" method="inputPaths" />
-    <pattern value="rife.bld.extension.PmdOperation" method="relativizeRoots" />
-    <pattern value="rife.bld.extension.PmdOperation" method="reportFormat" />
-    <pattern value="rife.bld.extension.PmdOperation" method="ruleSets" />
-    <pattern value="rife.bld.extension.PmdOperation" method="showSuppressed" />
-    <pattern value="rife.bld.extension.PmdOperation" method="suppressedMarker" />
-    <pattern value="rife.bld.extension.PmdOperation" method="threads" />
-    <pattern value="rife.bld.extension.PmdOperation" method="uri" />
-    <pattern value="rife.bld.extension.PmdOperationBuild" method="jacoco" />
   </component>
   <component name="PDMPlugin">
-    <option name="customRuleSets">
-      <list>
-        <option value="K:\java\semver\config\pmd.xml" />
-        <option value="$PROJECT_DIR$/config/pmd.xml" />
-      </list>
-    </option>
     <option name="skipTestSources" value="false" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java
index 1a4080a..3edb88c 100644
--- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java
@@ -43,17 +43,17 @@ public class PmdOperationBuild extends Project {
         autoDownloadPurge = true;
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
 
-        var pmd = version(7, 0, 0, "rc3");
+        var pmd = version(7, 0, 0, "rc4");
         scope(compile)
                 .include(dependency("com.uwyn.rife2", "bld", version(1, 7, 2)))
                 .include(dependency("net.sourceforge.pmd", "pmd-java", pmd));
         scope(runtime)
                 .include(dependency("net.sourceforge.pmd", "pmd-java", pmd))
-                .include(dependency("org.slf4j", "slf4j-simple", version(2,0,7)));
+                .include(dependency("org.slf4j", "slf4j-simple", version(2,0,9)));
         scope(test)
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0)))
-                .include(dependency("org.assertj:assertj-joda-time:2.2.0"));
+                .include(dependency("org.assertj", "assertj-core", version(3, 24, 2)));
 
         javadocOperation()
                 .javadocOptions()
diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java
index d38e1f1..e91becf 100644
--- a/src/main/java/rife/bld/extension/PmdOperation.java
+++ b/src/main/java/rife/bld/extension/PmdOperation.java
@@ -24,6 +24,8 @@ import rife.bld.BaseProject;
 import rife.bld.operations.AbstractOperation;
 
 import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
@@ -66,7 +68,7 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
     /**
      * The encoding.
      */
-    String encoding = "UTF-8";
+    Charset encoding_ = StandardCharsets.UTF_8;
     /**
      * The fail on violation toggle.
      */
@@ -204,7 +206,18 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
      * <p>The valid values are the standard character sets of {@link java.nio.charset.Charset Charset}.</p>
      */
     public PmdOperation encoding(String encoding) {
-        encoding = encoding;
+        encoding_ = Charset.forName(encoding);
+        return this;
+    }
+
+    /**
+     * <p>Specifies the character set encoding of the source code files. The default is
+     * {@link StandardCharsets#UTF_8 UTF-8}.</p>
+     *
+     * <p>The valid values are the standard character sets of {@link java.nio.charset.Charset Charset}.</p>
+     */
+    public PmdOperation encoding(Charset encoding) {
+        encoding_ = encoding;
         return this;
     }
 
@@ -331,7 +344,7 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
         config.setReportFormat(reportFormat_);
         config.setRuleSets(ruleSets_);
         config.setShowSuppressedViolations(showSuppressed_);
-        config.setSourceEncoding(encoding);
+        config.setSourceEncoding(encoding_);
         config.setSuppressMarker(suppressedMarker_);
         config.setThreads(threads_);
 
@@ -372,9 +385,7 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
                                     v.getFileId().getAbsolutePath(),
                                     v.getBeginLine(),
                                     v.getRule().getName(),
-                                    v.getRule().getExternalInfoUrl() //TODO bug in PMD?
-                                            .replace("${pmd.website.baseurl}",
-                                            "https://docs.pmd-code.org/pmd-doc-7.0.0-rc1"),
+                                    v.getRule().getExternalInfoUrl(),
                                     v.getDescription()});
                 }
             }
diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java
index 73179dd..c53b7a9 100644
--- a/src/test/java/rife/bld/extension/PmdOperationTest.java
+++ b/src/test/java/rife/bld/extension/PmdOperationTest.java
@@ -16,6 +16,7 @@
 
 package rife.bld.extension;
 
+import net.sourceforge.pmd.PMDConfiguration;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -74,9 +75,13 @@ class PmdOperationTest {
 
     @Test
     void testEncoding() {
-        var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).encoding("UTF-16");
-        var config = pmd.initConfiguration(COMMAND_NAME);
-        assertThat(config.getSourceEncoding()).isEqualTo(StandardCharsets.UTF_16);
+        PmdOperation pmd = newPmdOperation().ruleSets(CATEGORY_FOO).encoding("UTF-16");
+        PMDConfiguration config = pmd.initConfiguration(COMMAND_NAME);
+        assertThat(config.getSourceEncoding()).isEqualTo(StandardCharsets.UTF_16).as("UTF-16");
+
+        pmd = pmd.encoding(StandardCharsets.ISO_8859_1);
+        config = pmd.initConfiguration(COMMAND_NAME);
+        assertThat(config.getSourceEncoding()).isEqualTo(StandardCharsets.ISO_8859_1).as("ISO_8859");
     }
 
     @Test