From e90ad83cd0cb444ff9b5b67ffae9cd2067dbd449 Mon Sep 17 00:00:00 2001
From: Roy Clarkson <rclarkson@vmware.com>
Date: Fri, 31 Jan 2020 13:20:57 -0500
Subject: [PATCH] Upgrade to pmd 6.21.0

---
 build.gradle               | 2 +-
 src/pmd/pmdRuleSet.xml     | 1 +
 src/pmd/pmdTestRuleSet.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0eb1c8e..a3e9f9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ ext {
 	blockHoundVersion = "1.0.1.RELEASE"
 	junitPlatformLauncherVersion = "1.5.2"
 	checkstyleVersion = "8.21"
-	pmdVersion = "6.19.0"
+	pmdVersion = "6.21.0"
 
 	javadocLinks = [
 		"https://docs.oracle.com/javase/8/docs/api/",
diff --git a/src/pmd/pmdRuleSet.xml b/src/pmd/pmdRuleSet.xml
index 27c8801..ed26d86 100644
--- a/src/pmd/pmdRuleSet.xml
+++ b/src/pmd/pmdRuleSet.xml
@@ -57,6 +57,7 @@
 		<exclude name="AvoidFieldNameMatchingMethodName" />
 		<exclude name="BeanMembersShouldSerialize" />
 		<exclude name="DataflowAnomalyAnalysis" />
+		<exclude name="InvalidLogMessageFormat" />
 	</rule>
 	<rule ref="category/java/multithreading.xml">
 		<exclude name="UseConcurrentHashMap" />
diff --git a/src/pmd/pmdTestRuleSet.xml b/src/pmd/pmdTestRuleSet.xml
index 724d6bb..7118ecf 100644
--- a/src/pmd/pmdTestRuleSet.xml
+++ b/src/pmd/pmdTestRuleSet.xml
@@ -68,6 +68,7 @@
 		<exclude name="AvoidDuplicateLiterals" />
 		<exclude name="BeanMembersShouldSerialize" />
 		<exclude name="DataflowAnomalyAnalysis" />
+		<exclude name="InvalidLogMessageFormat" />
 		<exclude name="NonStaticInitializer" />
 	</rule>
 	<rule ref="category/java/multithreading.xml">