From 8d08016a9408384cbe11da5974798cffaa0ddb4e Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Mon, 16 Sep 2019 20:42:01 +0200
Subject: [PATCH] Update PMD to 6.18.0, remove unnecessary suppressions

---
 pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java   | 1 -
 .../java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java  | 1 -
 pom.xml                                                       | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
index 294e263ad7..3197025d65 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
@@ -133,7 +133,6 @@ public class CPDTask extends Task {
         CPDRenderer renderer = createRenderer();
         
         try {
-            @SuppressWarnings("PMD.CloseResource")
             // will be closed via BufferedWriter/OutputStreamWriter chain down below
             final OutputStream os;
             if (outputFile == null) {
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
index b8fd04842d..9e552aac82 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
@@ -155,7 +155,6 @@ public class AbstractVmNode extends AbstractNode implements VmNode {
      */
     @Deprecated
     public void dump(final String prefix, final boolean recurse, final Writer writer) {
-        @SuppressWarnings("PMD.CloseResource")
         final PrintWriter printWriter = writer instanceof PrintWriter ? (PrintWriter) writer : new PrintWriter(writer);
         printWriter.println(toString(prefix));
         if (children != null && recurse) {
diff --git a/pom.xml b/pom.xml
index 0c1f9871ac..547fac6b1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,12 +361,12 @@ Objective-C, Perl, PHP, PLSQL, Python, Ruby, Salesforce.com Apex, Scala, Swift a
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-core</artifactId>
-                            <version>6.17.0</version>
+                            <version>6.18.0</version>
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-java</artifactId>
-                            <version>6.17.0</version>
+                            <version>6.18.0</version>
                         </dependency>
                         <!-- This contains the dogfood ruleset -->
                         <dependency>