From 285fbfa657677a8d197984dcc70992098af8f9a9 Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Thu, 25 Jun 2015 18:02:26 +1000
Subject: Update rules for newer pmd.

---
 .../src/main/resources/jetty/pmd_logging_ruleset.xml               | 7 ++++---
 jetty-build-support/src/main/resources/jetty/pmd_ruleset.xml       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jetty-build-support/src/main/resources/jetty/pmd_logging_ruleset.xml b/jetty-build-support/src/main/resources/jetty/pmd_logging_ruleset.xml
index 9e1c492..4a4fb77 100644
--- a/jetty-build-support/src/main/resources/jetty/pmd_logging_ruleset.xml
+++ b/jetty-build-support/src/main/resources/jetty/pmd_logging_ruleset.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <ruleset name="Custom PMD Ruleset"
-   xmlns="http://pmd.sf.net/ruleset/1.0.0"
+   xmlns="http://pmd.sf.net/ruleset/2.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
-   xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
+   xsi:schemaLocation="http://pmd.sf.net/ruleset/2.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
    <description>PMD Logging Rule Set for Jetty</description>
 
    <!-- CUSTOM RULES -->
    <rule name="AvoidAnonymousLogging"
          since="1.0"
+         language="java"
          message="Use named logging, not anonymous"
-         class="net.sourceforge.pmd.rules.XPathRule">
+         class="net.sourceforge.pmd.lang.rule.XPathRule">
       <description>
 AvoidAnonymousLogging finds instances of Anonymous logging use.
 This is bad form and treats logging of the system as a whole, not
diff --git a/jetty-build-support/src/main/resources/jetty/pmd_ruleset.xml b/jetty-build-support/src/main/resources/jetty/pmd_ruleset.xml
index f59fc8b..b0cea91 100644
--- a/jetty-build-support/src/main/resources/jetty/pmd_ruleset.xml
+++ b/jetty-build-support/src/main/resources/jetty/pmd_ruleset.xml
@@ -80,7 +80,7 @@
    <rule name="ExplicitIgnoredCatchBlock"
          since="1.0"
          message="Set catch variable to 'ignore' to indicate it being ignored"
-         class="net.sourceforge.pmd.rules.XPathRule">
+         class="net.sourceforge.pmd.lang.rule.XPathRule">
       <description>
 ExplicitIgnoredCatchBlock finds instances where an exception is caught,
 but nothing is done.  In most circumstances, this swallows an exception
-- 
cgit v1.2.3