From 8a89a4c7861a2fecb3710c0242ded6f3958c2250 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 1 Jun 2023 17:29:24 +0200
Subject: [PATCH] Use explicit encoding in ruleset files

---
 .../resources/category/apex/bestpractices.xml |  2 +-
 .../resources/category/apex/codestyle.xml     |  2 +-
 .../main/resources/category/apex/design.xml   |  2 +-
 .../resources/category/apex/documentation.xml |  2 +-
 .../resources/category/apex/errorprone.xml    |  2 +-
 .../category/apex/multithreading.xml          |  2 +-
 .../resources/category/apex/performance.xml   |  2 +-
 .../main/resources/category/apex/security.xml |  2 +-
 .../pmd/lang/apex/DefaultRulesetTest.java     |  9 ++++-
 .../resources/category/html/bestpractices.xml |  2 +-
 .../resources/category/html/codestyle.xml     |  2 +-
 .../main/resources/category/html/design.xml   |  2 +-
 .../resources/category/html/documentation.xml |  2 +-
 .../resources/category/html/errorprone.xml    |  2 +-
 .../category/html/multithreading.xml          |  2 +-
 .../resources/category/html/performance.xml   |  2 +-
 .../main/resources/category/html/security.xml |  2 +-
 .../resources/category/java/bestpractices.xml |  2 +-
 .../resources/category/java/codestyle.xml     |  2 +-
 .../main/resources/category/java/design.xml   |  2 +-
 .../resources/category/java/documentation.xml |  2 +-
 .../resources/category/java/errorprone.xml    |  2 +-
 .../category/java/multithreading.xml          |  2 +-
 .../resources/category/java/performance.xml   |  2 +-
 .../main/resources/category/java/security.xml |  2 +-
 .../resources/rulesets/java/quickstart.xml    |  2 +-
 .../pmd/lang/java/QuickstartRulesetTest.java  |  9 ++++-
 .../category/ecmascript/bestpractices.xml     |  2 +-
 .../category/ecmascript/codestyle.xml         |  2 +-
 .../resources/category/ecmascript/design.xml  |  2 +-
 .../category/ecmascript/documentation.xml     |  2 +-
 .../category/ecmascript/errorprone.xml        |  2 +-
 .../category/ecmascript/multithreading.xml    |  2 +-
 .../category/ecmascript/performance.xml       |  2 +-
 .../category/ecmascript/security.xml          |  2 +-
 .../resources/category/jsp/bestpractices.xml  |  2 +-
 .../main/resources/category/jsp/codestyle.xml |  2 +-
 .../main/resources/category/jsp/design.xml    |  2 +-
 .../resources/category/jsp/documentation.xml  |  2 +-
 .../resources/category/jsp/errorprone.xml     |  2 +-
 .../resources/category/jsp/multithreading.xml |  2 +-
 .../resources/category/jsp/performance.xml    |  2 +-
 .../main/resources/category/jsp/security.xml  |  2 +-
 .../category/kotlin/bestpractices.xml         |  2 +-
 .../resources/category/kotlin/errorprone.xml  |  2 +-
 .../category/modelica/bestpractices.xml       |  2 +-
 .../category/plsql/bestpractices.xml          |  2 +-
 .../resources/category/plsql/codestyle.xml    |  2 +-
 .../main/resources/category/plsql/design.xml  |  2 +-
 .../category/plsql/documentation.xml          |  2 +-
 .../resources/category/plsql/errorprone.xml   |  2 +-
 .../category/plsql/multithreading.xml         |  2 +-
 .../resources/category/plsql/performance.xml  |  2 +-
 .../resources/category/plsql/security.xml     |  2 +-
 .../category/scala/bestpractices.xml          |  2 +-
 .../resources/category/scala/codestyle.xml    |  2 +-
 .../main/resources/category/scala/design.xml  |  2 +-
 .../category/scala/documentation.xml          |  2 +-
 .../resources/category/scala/errorprone.xml   | 12 +++----
 .../category/scala/multithreading.xml         |  2 +-
 .../resources/category/scala/performance.xml  |  2 +-
 .../resources/category/scala/security.xml     |  2 +-
 .../category/swift/bestpractices.xml          |  2 +-
 .../resources/category/swift/codestyle.xml    |  2 +-
 .../main/resources/category/swift/design.xml  |  2 +-
 .../category/swift/documentation.xml          |  4 +--
 .../resources/category/swift/errorprone.xml   |  2 +-
 .../category/swift/multithreading.xml         |  4 +--
 .../resources/category/swift/performance.xml  |  2 +-
 .../resources/category/swift/security.xml     |  2 +-
 .../pmd/AbstractRuleSetFactoryTest.java       | 35 +++++++++++++++++--
 .../resources/category/vf/bestpractices.xml   |  2 +-
 .../main/resources/category/vf/codestyle.xml  |  2 +-
 .../src/main/resources/category/vf/design.xml |  2 +-
 .../resources/category/vf/documentation.xml   |  2 +-
 .../main/resources/category/vf/errorprone.xml |  2 +-
 .../resources/category/vf/multithreading.xml  |  2 +-
 .../resources/category/vf/performance.xml     |  2 +-
 .../main/resources/category/vf/security.xml   |  2 +-
 .../resources/category/vm/bestpractices.xml   |  2 +-
 .../main/resources/category/vm/codestyle.xml  |  2 +-
 .../src/main/resources/category/vm/design.xml |  2 +-
 .../resources/category/vm/documentation.xml   |  2 +-
 .../main/resources/category/vm/errorprone.xml |  2 +-
 .../resources/category/vm/multithreading.xml  |  2 +-
 .../resources/category/vm/performance.xml     |  2 +-
 .../main/resources/category/vm/security.xml   |  2 +-
 .../resources/category/pom/bestpractices.xml  |  2 +-
 .../main/resources/category/pom/codestyle.xml |  2 +-
 .../main/resources/category/pom/design.xml    |  2 +-
 .../resources/category/pom/documentation.xml  |  2 +-
 .../resources/category/pom/errorprone.xml     |  2 +-
 .../resources/category/pom/multithreading.xml |  2 +-
 .../resources/category/pom/performance.xml    |  2 +-
 .../main/resources/category/pom/security.xml  |  2 +-
 .../resources/category/wsdl/bestpractices.xml |  2 +-
 .../resources/category/wsdl/codestyle.xml     |  2 +-
 .../main/resources/category/wsdl/design.xml   |  2 +-
 .../resources/category/wsdl/documentation.xml |  2 +-
 .../resources/category/wsdl/errorprone.xml    |  2 +-
 .../category/wsdl/multithreading.xml          |  2 +-
 .../resources/category/wsdl/performance.xml   |  2 +-
 .../main/resources/category/wsdl/security.xml |  2 +-
 .../resources/category/xml/bestpractices.xml  |  2 +-
 .../main/resources/category/xml/codestyle.xml |  2 +-
 .../main/resources/category/xml/design.xml    |  2 +-
 .../resources/category/xml/documentation.xml  |  2 +-
 .../resources/category/xml/errorprone.xml     |  2 +-
 .../resources/category/xml/multithreading.xml |  2 +-
 .../resources/category/xml/performance.xml    |  2 +-
 .../main/resources/category/xml/security.xml  |  2 +-
 .../resources/category/xsl/bestpractices.xml  |  2 +-
 .../main/resources/category/xsl/codestyle.xml |  2 +-
 .../main/resources/category/xsl/design.xml    |  2 +-
 .../resources/category/xsl/documentation.xml  |  2 +-
 .../resources/category/xsl/errorprone.xml     |  2 +-
 .../resources/category/xsl/multithreading.xml |  2 +-
 .../resources/category/xsl/performance.xml    |  2 +-
 .../main/resources/category/xsl/security.xml  |  2 +-
 119 files changed, 171 insertions(+), 128 deletions(-)

diff --git a/pmd-apex/src/main/resources/category/apex/bestpractices.xml b/pmd-apex/src/main/resources/category/apex/bestpractices.xml
index 6763f71d9a..178f94e82e 100644
--- a/pmd-apex/src/main/resources/category/apex/bestpractices.xml
+++ b/pmd-apex/src/main/resources/category/apex/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/codestyle.xml b/pmd-apex/src/main/resources/category/apex/codestyle.xml
index 0fd72a9408..c2028bfd3c 100644
--- a/pmd-apex/src/main/resources/category/apex/codestyle.xml
+++ b/pmd-apex/src/main/resources/category/apex/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/design.xml b/pmd-apex/src/main/resources/category/apex/design.xml
index 808ceb08b7..4375fa3441 100644
--- a/pmd-apex/src/main/resources/category/apex/design.xml
+++ b/pmd-apex/src/main/resources/category/apex/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/documentation.xml b/pmd-apex/src/main/resources/category/apex/documentation.xml
index bbe588d08f..22600c7ced 100644
--- a/pmd-apex/src/main/resources/category/apex/documentation.xml
+++ b/pmd-apex/src/main/resources/category/apex/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/errorprone.xml b/pmd-apex/src/main/resources/category/apex/errorprone.xml
index 3083cc1e72..76795e4987 100644
--- a/pmd-apex/src/main/resources/category/apex/errorprone.xml
+++ b/pmd-apex/src/main/resources/category/apex/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/multithreading.xml b/pmd-apex/src/main/resources/category/apex/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-apex/src/main/resources/category/apex/multithreading.xml
+++ b/pmd-apex/src/main/resources/category/apex/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/performance.xml b/pmd-apex/src/main/resources/category/apex/performance.xml
index f4fa90f2ea..2d067dc687 100644
--- a/pmd-apex/src/main/resources/category/apex/performance.xml
+++ b/pmd-apex/src/main/resources/category/apex/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/main/resources/category/apex/security.xml b/pmd-apex/src/main/resources/category/apex/security.xml
index d53437dd92..ca090afc48 100644
--- a/pmd-apex/src/main/resources/category/apex/security.xml
+++ b/pmd-apex/src/main/resources/category/apex/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java
index 9f8dd289b3..3ca9685389 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java
@@ -9,12 +9,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
+import net.sourceforge.pmd.AbstractRuleSetFactoryTest;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSetLoader;
 
 import com.github.stefanbirkner.systemlambda.SystemLambda;
 
 class DefaultRulesetTest {
+    private static final String QUICKSTART_RULESET = "rulesets/apex/quickstart.xml";
 
     @Test
     void loadDefaultRuleset() {
@@ -25,12 +27,17 @@ class DefaultRulesetTest {
     @Test
     void loadQuickstartRuleset() throws Exception {
         String log = SystemLambda.tapSystemErr(() -> {
-            RuleSet ruleset = rulesetLoader().loadFromResource("rulesets/apex/quickstart.xml");
+            RuleSet ruleset = rulesetLoader().loadFromResource(QUICKSTART_RULESET);
             assertNotNull(ruleset);
         });
         assertTrue(log.isEmpty(), "No Logging expected");
     }
 
+    @Test
+    void correctEncoding() throws Exception {
+        assertTrue(AbstractRuleSetFactoryTest.hasCorrectEncoding(QUICKSTART_RULESET));
+    }
+
     private RuleSetLoader rulesetLoader() {
         return new RuleSetLoader().enableCompatibility(false);
     }
diff --git a/pmd-html/src/main/resources/category/html/bestpractices.xml b/pmd-html/src/main/resources/category/html/bestpractices.xml
index 19c07662e9..775e366565 100644
--- a/pmd-html/src/main/resources/category/html/bestpractices.xml
+++ b/pmd-html/src/main/resources/category/html/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/codestyle.xml b/pmd-html/src/main/resources/category/html/codestyle.xml
index c9a6b51d10..7d28749e66 100644
--- a/pmd-html/src/main/resources/category/html/codestyle.xml
+++ b/pmd-html/src/main/resources/category/html/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/design.xml b/pmd-html/src/main/resources/category/html/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-html/src/main/resources/category/html/design.xml
+++ b/pmd-html/src/main/resources/category/html/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/documentation.xml b/pmd-html/src/main/resources/category/html/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-html/src/main/resources/category/html/documentation.xml
+++ b/pmd-html/src/main/resources/category/html/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/errorprone.xml b/pmd-html/src/main/resources/category/html/errorprone.xml
index ff1f6fc771..c4e460d519 100644
--- a/pmd-html/src/main/resources/category/html/errorprone.xml
+++ b/pmd-html/src/main/resources/category/html/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/multithreading.xml b/pmd-html/src/main/resources/category/html/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-html/src/main/resources/category/html/multithreading.xml
+++ b/pmd-html/src/main/resources/category/html/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/performance.xml b/pmd-html/src/main/resources/category/html/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-html/src/main/resources/category/html/performance.xml
+++ b/pmd-html/src/main/resources/category/html/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-html/src/main/resources/category/html/security.xml b/pmd-html/src/main/resources/category/html/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-html/src/main/resources/category/html/security.xml
+++ b/pmd-html/src/main/resources/category/html/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml
index b2e2f655eb..5d0d3896da 100644
--- a/pmd-java/src/main/resources/category/java/bestpractices.xml
+++ b/pmd-java/src/main/resources/category/java/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
index f2d4043478..2748d467e7 100644
--- a/pmd-java/src/main/resources/category/java/codestyle.xml
+++ b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 1778029ba6..f66e3bbebb 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/documentation.xml b/pmd-java/src/main/resources/category/java/documentation.xml
index 8a3623387c..b948fba2ef 100644
--- a/pmd-java/src/main/resources/category/java/documentation.xml
+++ b/pmd-java/src/main/resources/category/java/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/errorprone.xml b/pmd-java/src/main/resources/category/java/errorprone.xml
index 73b9dfc494..f24940100e 100644
--- a/pmd-java/src/main/resources/category/java/errorprone.xml
+++ b/pmd-java/src/main/resources/category/java/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/multithreading.xml b/pmd-java/src/main/resources/category/java/multithreading.xml
index f2511fdbac..a2a2dfe05b 100644
--- a/pmd-java/src/main/resources/category/java/multithreading.xml
+++ b/pmd-java/src/main/resources/category/java/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/performance.xml b/pmd-java/src/main/resources/category/java/performance.xml
index e586ada4cb..3e2629e681 100644
--- a/pmd-java/src/main/resources/category/java/performance.xml
+++ b/pmd-java/src/main/resources/category/java/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-java/src/main/resources/category/java/security.xml b/pmd-java/src/main/resources/category/java/security.xml
index e279d7b30f..0bc45a49e9 100644
--- a/pmd-java/src/main/resources/category/java/security.xml
+++ b/pmd-java/src/main/resources/category/java/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/pmd-java/src/main/resources/rulesets/java/quickstart.xml b/pmd-java/src/main/resources/rulesets/java/quickstart.xml
index 6be4cfb7e3..1dbf9e077b 100644
--- a/pmd-java/src/main/resources/rulesets/java/quickstart.xml
+++ b/pmd-java/src/main/resources/rulesets/java/quickstart.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="quickstart"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java
index e7182c7382..2b7ffdc9fd 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java
@@ -9,20 +9,27 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
+import net.sourceforge.pmd.AbstractRuleSetFactoryTest;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSetLoader;
 
 import com.github.stefanbirkner.systemlambda.SystemLambda;
 
 class QuickstartRulesetTest {
+    private static final String QUICKSTART_RULESET = "rulesets/java/quickstart.xml";
 
     @Test
     void noDeprecations() throws Exception {
         RuleSetLoader ruleSetLoader = new RuleSetLoader().enableCompatibility(false);
         String errorOutput = SystemLambda.tapSystemErr(() -> {
-            RuleSet quickstart = ruleSetLoader.loadFromResource("rulesets/java/quickstart.xml");
+            RuleSet quickstart = ruleSetLoader.loadFromResource(QUICKSTART_RULESET);
             assertFalse(quickstart.getRules().isEmpty());
         });
         assertTrue(errorOutput.isEmpty());
     }
+
+    @Test
+    void correctEncoding() throws Exception {
+        assertTrue(AbstractRuleSetFactoryTest.hasCorrectEncoding(QUICKSTART_RULESET));
+    }
 }
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/bestpractices.xml b/pmd-javascript/src/main/resources/category/ecmascript/bestpractices.xml
index 4c76991f98..3e476dacdd 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/bestpractices.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
index adf8f817ee..42bdcb2d57 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/design.xml b/pmd-javascript/src/main/resources/category/ecmascript/design.xml
index bfb2bad983..3ea1863a23 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/design.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/documentation.xml b/pmd-javascript/src/main/resources/category/ecmascript/documentation.xml
index 8e7fe03896..648fc69c07 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/documentation.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml b/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml
index 0f0a2a06ed..4eab35baa8 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/multithreading.xml b/pmd-javascript/src/main/resources/category/ecmascript/multithreading.xml
index ee972ffd58..fc4ba42507 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/multithreading.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/performance.xml b/pmd-javascript/src/main/resources/category/ecmascript/performance.xml
index a3a1b2fd09..10ce6520bb 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/performance.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-javascript/src/main/resources/category/ecmascript/security.xml b/pmd-javascript/src/main/resources/category/ecmascript/security.xml
index 2c59db990c..c41507f797 100644
--- a/pmd-javascript/src/main/resources/category/ecmascript/security.xml
+++ b/pmd-javascript/src/main/resources/category/ecmascript/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml b/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml
index 564c645975..986833ca55 100644
--- a/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/codestyle.xml b/pmd-jsp/src/main/resources/category/jsp/codestyle.xml
index 1317a60d15..de663f3ed5 100644
--- a/pmd-jsp/src/main/resources/category/jsp/codestyle.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/design.xml b/pmd-jsp/src/main/resources/category/jsp/design.xml
index 66f142629c..2d23cbc41a 100644
--- a/pmd-jsp/src/main/resources/category/jsp/design.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/documentation.xml b/pmd-jsp/src/main/resources/category/jsp/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-jsp/src/main/resources/category/jsp/documentation.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/errorprone.xml b/pmd-jsp/src/main/resources/category/jsp/errorprone.xml
index 1006fb141d..635dec3a6a 100644
--- a/pmd-jsp/src/main/resources/category/jsp/errorprone.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/multithreading.xml b/pmd-jsp/src/main/resources/category/jsp/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-jsp/src/main/resources/category/jsp/multithreading.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/performance.xml b/pmd-jsp/src/main/resources/category/jsp/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-jsp/src/main/resources/category/jsp/performance.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-jsp/src/main/resources/category/jsp/security.xml b/pmd-jsp/src/main/resources/category/jsp/security.xml
index 642c252022..4a29b0fba4 100644
--- a/pmd-jsp/src/main/resources/category/jsp/security.xml
+++ b/pmd-jsp/src/main/resources/category/jsp/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-kotlin/src/main/resources/category/kotlin/bestpractices.xml b/pmd-kotlin/src/main/resources/category/kotlin/bestpractices.xml
index e52f8db847..a28c34e39a 100644
--- a/pmd-kotlin/src/main/resources/category/kotlin/bestpractices.xml
+++ b/pmd-kotlin/src/main/resources/category/kotlin/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-kotlin/src/main/resources/category/kotlin/errorprone.xml b/pmd-kotlin/src/main/resources/category/kotlin/errorprone.xml
index d0e5983f49..3a48c5432a 100644
--- a/pmd-kotlin/src/main/resources/category/kotlin/errorprone.xml
+++ b/pmd-kotlin/src/main/resources/category/kotlin/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml b/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml
index d4ad841943..95453f30e6 100644
--- a/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml
+++ b/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml b/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml
index d18992823f..1af8bcde7b 100644
--- a/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
index 2e01fea8c7..415199974b 100644
--- a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/design.xml b/pmd-plsql/src/main/resources/category/plsql/design.xml
index 84e6788a1f..2e27b89f79 100644
--- a/pmd-plsql/src/main/resources/category/plsql/design.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/documentation.xml b/pmd-plsql/src/main/resources/category/plsql/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-plsql/src/main/resources/category/plsql/documentation.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/errorprone.xml b/pmd-plsql/src/main/resources/category/plsql/errorprone.xml
index ff7127701b..72f00e6bb8 100644
--- a/pmd-plsql/src/main/resources/category/plsql/errorprone.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/multithreading.xml b/pmd-plsql/src/main/resources/category/plsql/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-plsql/src/main/resources/category/plsql/multithreading.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/performance.xml b/pmd-plsql/src/main/resources/category/plsql/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-plsql/src/main/resources/category/plsql/performance.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-plsql/src/main/resources/category/plsql/security.xml b/pmd-plsql/src/main/resources/category/plsql/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-plsql/src/main/resources/category/plsql/security.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/bestpractices.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/bestpractices.xml
index 58e7fd43a3..126b820901 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/bestpractices.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/codestyle.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/codestyle.xml
index c9a6b51d10..7d28749e66 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/codestyle.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/design.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/design.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/documentation.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/documentation.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/errorprone.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/errorprone.xml
index 88221d226e..63d6f4a281 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/errorprone.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/errorprone.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
-	xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
 
-	<description>
+    <description>
 Rules to detect constructs that are either broken, extremely confusing or prone to runtime errors.
     </description>
-
-
 </ruleset>
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/multithreading.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/multithreading.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/performance.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/performance.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/security.xml b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/security.xml
+++ b/pmd-scala-modules/pmd-scala-common/src/main/resources/category/scala/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-swift/src/main/resources/category/swift/bestpractices.xml b/pmd-swift/src/main/resources/category/swift/bestpractices.xml
index cab248b276..e1d9ad423e 100644
--- a/pmd-swift/src/main/resources/category/swift/bestpractices.xml
+++ b/pmd-swift/src/main/resources/category/swift/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-swift/src/main/resources/category/swift/codestyle.xml b/pmd-swift/src/main/resources/category/swift/codestyle.xml
index f23dab5a5d..05a77ed963 100644
--- a/pmd-swift/src/main/resources/category/swift/codestyle.xml
+++ b/pmd-swift/src/main/resources/category/swift/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-swift/src/main/resources/category/swift/design.xml b/pmd-swift/src/main/resources/category/swift/design.xml
index 3ffd0d0602..691989d5fc 100644
--- a/pmd-swift/src/main/resources/category/swift/design.xml
+++ b/pmd-swift/src/main/resources/category/swift/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-swift/src/main/resources/category/swift/documentation.xml b/pmd-swift/src/main/resources/category/swift/documentation.xml
index 9417a47809..a802c71f05 100644
--- a/pmd-swift/src/main/resources/category/swift/documentation.xml
+++ b/pmd-swift/src/main/resources/category/swift/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
@@ -8,4 +8,4 @@
     <description>
 Rules that are related to code documentation.
     </description>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/pmd-swift/src/main/resources/category/swift/errorprone.xml b/pmd-swift/src/main/resources/category/swift/errorprone.xml
index e4dab5022d..7bf277656b 100644
--- a/pmd-swift/src/main/resources/category/swift/errorprone.xml
+++ b/pmd-swift/src/main/resources/category/swift/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-swift/src/main/resources/category/swift/multithreading.xml b/pmd-swift/src/main/resources/category/swift/multithreading.xml
index 3b25979bb6..1564f78cdc 100644
--- a/pmd-swift/src/main/resources/category/swift/multithreading.xml
+++ b/pmd-swift/src/main/resources/category/swift/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
@@ -8,4 +8,4 @@
     <description>
 Rules that flag issues when dealing with multiple threads of execution.
     </description>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/pmd-swift/src/main/resources/category/swift/performance.xml b/pmd-swift/src/main/resources/category/swift/performance.xml
index be669f985c..f791f2f69f 100644
--- a/pmd-swift/src/main/resources/category/swift/performance.xml
+++ b/pmd-swift/src/main/resources/category/swift/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-swift/src/main/resources/category/swift/security.xml b/pmd-swift/src/main/resources/category/swift/security.xml
index fae2a25682..b92b1e7c88 100644
--- a/pmd-swift/src/main/resources/category/swift/security.xml
+++ b/pmd-swift/src/main/resources/category/swift/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/AbstractRuleSetFactoryTest.java b/pmd-test/src/main/java/net/sourceforge/pmd/AbstractRuleSetFactoryTest.java
index c4f8c22a46..29d43b1c84 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/AbstractRuleSetFactoryTest.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/AbstractRuleSetFactoryTest.java
@@ -16,6 +16,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -230,6 +231,36 @@ public abstract class AbstractRuleSetFactoryTest {
         assertTrue(allValid, "All XML must parse without producing validation messages.");
     }
 
+    @Test
+    void verifyCorrectXmlEncoding() throws Exception {
+        boolean allValid = true;
+        List<String> ruleSetFileNames = getRuleSetFileNames();
+        StringBuilder messages = new StringBuilder();
+        for (String fileName : ruleSetFileNames) {
+            boolean valid = hasCorrectEncoding(fileName);
+            allValid = allValid && valid;
+            if (!valid) {
+                messages.append("RuleSet ")
+                        .append(fileName)
+                        .append(" is missing XML encoding or not using UTF8\n");
+            }
+        }
+        assertTrue(allValid, "All XML must use correct XML encoding\n" + messages);
+    }
+
+    public static boolean hasCorrectEncoding(String fileName) throws IOException {
+        try (InputStream inputStream = loadResourceAsStream(fileName)) {
+            // first bytes must be:
+            byte[] expectedBytes = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes(StandardCharsets.UTF_8);
+            byte[] bytes = new byte[expectedBytes.length];
+            int count = inputStream.read(bytes);
+            if (count != expectedBytes.length || !Arrays.equals(expectedBytes, bytes)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Verifies that all rulesets are valid XML according to the DTD.
      *
@@ -381,8 +412,8 @@ public abstract class AbstractRuleSetFactoryTest {
         }
     }
 
-    private InputStream loadResourceAsStream(String resource) {
-        return getClass().getClassLoader().getResourceAsStream(resource);
+    private static InputStream loadResourceAsStream(String resource) {
+        return AbstractRuleSetFactoryTest.class.getClassLoader().getResourceAsStream(resource);
     }
 
     private void testRuleSet(String fileName) throws IOException, SAXException {
diff --git a/pmd-visualforce/src/main/resources/category/vf/bestpractices.xml b/pmd-visualforce/src/main/resources/category/vf/bestpractices.xml
index 58e7fd43a3..126b820901 100644
--- a/pmd-visualforce/src/main/resources/category/vf/bestpractices.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/codestyle.xml b/pmd-visualforce/src/main/resources/category/vf/codestyle.xml
index c9a6b51d10..7d28749e66 100644
--- a/pmd-visualforce/src/main/resources/category/vf/codestyle.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/design.xml b/pmd-visualforce/src/main/resources/category/vf/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-visualforce/src/main/resources/category/vf/design.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/documentation.xml b/pmd-visualforce/src/main/resources/category/vf/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-visualforce/src/main/resources/category/vf/documentation.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/errorprone.xml b/pmd-visualforce/src/main/resources/category/vf/errorprone.xml
index d3d13d8c34..63d6f4a281 100644
--- a/pmd-visualforce/src/main/resources/category/vf/errorprone.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/multithreading.xml b/pmd-visualforce/src/main/resources/category/vf/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-visualforce/src/main/resources/category/vf/multithreading.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/performance.xml b/pmd-visualforce/src/main/resources/category/vf/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-visualforce/src/main/resources/category/vf/performance.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-visualforce/src/main/resources/category/vf/security.xml b/pmd-visualforce/src/main/resources/category/vf/security.xml
index 2f4408e929..6325ba6fc1 100644
--- a/pmd-visualforce/src/main/resources/category/vf/security.xml
+++ b/pmd-visualforce/src/main/resources/category/vf/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/bestpractices.xml b/pmd-vm/src/main/resources/category/vm/bestpractices.xml
index f758c2bab4..327320f7f8 100644
--- a/pmd-vm/src/main/resources/category/vm/bestpractices.xml
+++ b/pmd-vm/src/main/resources/category/vm/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/codestyle.xml b/pmd-vm/src/main/resources/category/vm/codestyle.xml
index c9a6b51d10..7d28749e66 100644
--- a/pmd-vm/src/main/resources/category/vm/codestyle.xml
+++ b/pmd-vm/src/main/resources/category/vm/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/design.xml b/pmd-vm/src/main/resources/category/vm/design.xml
index 70a7c15941..50e5bae9fe 100644
--- a/pmd-vm/src/main/resources/category/vm/design.xml
+++ b/pmd-vm/src/main/resources/category/vm/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/documentation.xml b/pmd-vm/src/main/resources/category/vm/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-vm/src/main/resources/category/vm/documentation.xml
+++ b/pmd-vm/src/main/resources/category/vm/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/errorprone.xml b/pmd-vm/src/main/resources/category/vm/errorprone.xml
index 646d63aa69..bcc3ed19cd 100644
--- a/pmd-vm/src/main/resources/category/vm/errorprone.xml
+++ b/pmd-vm/src/main/resources/category/vm/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/multithreading.xml b/pmd-vm/src/main/resources/category/vm/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-vm/src/main/resources/category/vm/multithreading.xml
+++ b/pmd-vm/src/main/resources/category/vm/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/performance.xml b/pmd-vm/src/main/resources/category/vm/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-vm/src/main/resources/category/vm/performance.xml
+++ b/pmd-vm/src/main/resources/category/vm/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-vm/src/main/resources/category/vm/security.xml b/pmd-vm/src/main/resources/category/vm/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-vm/src/main/resources/category/vm/security.xml
+++ b/pmd-vm/src/main/resources/category/vm/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/bestpractices.xml b/pmd-xml/src/main/resources/category/pom/bestpractices.xml
index 58e7fd43a3..126b820901 100644
--- a/pmd-xml/src/main/resources/category/pom/bestpractices.xml
+++ b/pmd-xml/src/main/resources/category/pom/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/codestyle.xml b/pmd-xml/src/main/resources/category/pom/codestyle.xml
index a161db8c96..dc92a69b48 100644
--- a/pmd-xml/src/main/resources/category/pom/codestyle.xml
+++ b/pmd-xml/src/main/resources/category/pom/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/design.xml b/pmd-xml/src/main/resources/category/pom/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-xml/src/main/resources/category/pom/design.xml
+++ b/pmd-xml/src/main/resources/category/pom/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/documentation.xml b/pmd-xml/src/main/resources/category/pom/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-xml/src/main/resources/category/pom/documentation.xml
+++ b/pmd-xml/src/main/resources/category/pom/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/errorprone.xml b/pmd-xml/src/main/resources/category/pom/errorprone.xml
index ca783643c9..f548e873ab 100644
--- a/pmd-xml/src/main/resources/category/pom/errorprone.xml
+++ b/pmd-xml/src/main/resources/category/pom/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/multithreading.xml b/pmd-xml/src/main/resources/category/pom/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-xml/src/main/resources/category/pom/multithreading.xml
+++ b/pmd-xml/src/main/resources/category/pom/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/performance.xml b/pmd-xml/src/main/resources/category/pom/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-xml/src/main/resources/category/pom/performance.xml
+++ b/pmd-xml/src/main/resources/category/pom/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/pom/security.xml b/pmd-xml/src/main/resources/category/pom/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-xml/src/main/resources/category/pom/security.xml
+++ b/pmd-xml/src/main/resources/category/pom/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/bestpractices.xml b/pmd-xml/src/main/resources/category/wsdl/bestpractices.xml
index 58e7fd43a3..126b820901 100644
--- a/pmd-xml/src/main/resources/category/wsdl/bestpractices.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/codestyle.xml b/pmd-xml/src/main/resources/category/wsdl/codestyle.xml
index c9a6b51d10..7d28749e66 100644
--- a/pmd-xml/src/main/resources/category/wsdl/codestyle.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/design.xml b/pmd-xml/src/main/resources/category/wsdl/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-xml/src/main/resources/category/wsdl/design.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/documentation.xml b/pmd-xml/src/main/resources/category/wsdl/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-xml/src/main/resources/category/wsdl/documentation.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/errorprone.xml b/pmd-xml/src/main/resources/category/wsdl/errorprone.xml
index d3d13d8c34..63d6f4a281 100644
--- a/pmd-xml/src/main/resources/category/wsdl/errorprone.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/multithreading.xml b/pmd-xml/src/main/resources/category/wsdl/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-xml/src/main/resources/category/wsdl/multithreading.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/performance.xml b/pmd-xml/src/main/resources/category/wsdl/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-xml/src/main/resources/category/wsdl/performance.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/wsdl/security.xml b/pmd-xml/src/main/resources/category/wsdl/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-xml/src/main/resources/category/wsdl/security.xml
+++ b/pmd-xml/src/main/resources/category/wsdl/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/bestpractices.xml b/pmd-xml/src/main/resources/category/xml/bestpractices.xml
index 58e7fd43a3..126b820901 100644
--- a/pmd-xml/src/main/resources/category/xml/bestpractices.xml
+++ b/pmd-xml/src/main/resources/category/xml/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/codestyle.xml b/pmd-xml/src/main/resources/category/xml/codestyle.xml
index c9a6b51d10..7d28749e66 100644
--- a/pmd-xml/src/main/resources/category/xml/codestyle.xml
+++ b/pmd-xml/src/main/resources/category/xml/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/design.xml b/pmd-xml/src/main/resources/category/xml/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-xml/src/main/resources/category/xml/design.xml
+++ b/pmd-xml/src/main/resources/category/xml/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/documentation.xml b/pmd-xml/src/main/resources/category/xml/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-xml/src/main/resources/category/xml/documentation.xml
+++ b/pmd-xml/src/main/resources/category/xml/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/errorprone.xml b/pmd-xml/src/main/resources/category/xml/errorprone.xml
index 46f598d8e4..c07912ff5b 100644
--- a/pmd-xml/src/main/resources/category/xml/errorprone.xml
+++ b/pmd-xml/src/main/resources/category/xml/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/multithreading.xml b/pmd-xml/src/main/resources/category/xml/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-xml/src/main/resources/category/xml/multithreading.xml
+++ b/pmd-xml/src/main/resources/category/xml/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/performance.xml b/pmd-xml/src/main/resources/category/xml/performance.xml
index 251663aafc..0927717e10 100644
--- a/pmd-xml/src/main/resources/category/xml/performance.xml
+++ b/pmd-xml/src/main/resources/category/xml/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xml/security.xml b/pmd-xml/src/main/resources/category/xml/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-xml/src/main/resources/category/xml/security.xml
+++ b/pmd-xml/src/main/resources/category/xml/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/bestpractices.xml b/pmd-xml/src/main/resources/category/xsl/bestpractices.xml
index 58e7fd43a3..126b820901 100644
--- a/pmd-xml/src/main/resources/category/xsl/bestpractices.xml
+++ b/pmd-xml/src/main/resources/category/xsl/bestpractices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Best Practices"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/codestyle.xml b/pmd-xml/src/main/resources/category/xsl/codestyle.xml
index fd87bfc1ff..6363dfbf23 100644
--- a/pmd-xml/src/main/resources/category/xsl/codestyle.xml
+++ b/pmd-xml/src/main/resources/category/xsl/codestyle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Code Style"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/design.xml b/pmd-xml/src/main/resources/category/xsl/design.xml
index 6833b8b773..1c5b65c82a 100644
--- a/pmd-xml/src/main/resources/category/xsl/design.xml
+++ b/pmd-xml/src/main/resources/category/xsl/design.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Design"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/documentation.xml b/pmd-xml/src/main/resources/category/xsl/documentation.xml
index c049f5b6f0..d29ba3f2e2 100644
--- a/pmd-xml/src/main/resources/category/xsl/documentation.xml
+++ b/pmd-xml/src/main/resources/category/xsl/documentation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Documentation"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/errorprone.xml b/pmd-xml/src/main/resources/category/xsl/errorprone.xml
index d3d13d8c34..63d6f4a281 100644
--- a/pmd-xml/src/main/resources/category/xsl/errorprone.xml
+++ b/pmd-xml/src/main/resources/category/xsl/errorprone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Error Prone"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/multithreading.xml b/pmd-xml/src/main/resources/category/xsl/multithreading.xml
index 88c22dfc8b..0681a5d987 100644
--- a/pmd-xml/src/main/resources/category/xsl/multithreading.xml
+++ b/pmd-xml/src/main/resources/category/xsl/multithreading.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Multithreading"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/performance.xml b/pmd-xml/src/main/resources/category/xsl/performance.xml
index 5f1f3a5947..0e5201d43d 100644
--- a/pmd-xml/src/main/resources/category/xsl/performance.xml
+++ b/pmd-xml/src/main/resources/category/xsl/performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Performance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
diff --git a/pmd-xml/src/main/resources/category/xsl/security.xml b/pmd-xml/src/main/resources/category/xsl/security.xml
index d6fa5415a5..36afb2f5af 100644
--- a/pmd-xml/src/main/resources/category/xsl/security.xml
+++ b/pmd-xml/src/main/resources/category/xsl/security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <ruleset name="Security"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"