Updated to PMD 6.46.0

Author: adangel

ReleaseNotes.md

@@ -13,6 +13,8 @@ This is a minor release.
 
 ### New and noteworthy
 
+*   Updated to PMD 6.46.0
+
 ### Fixed Issues
 
 *   [#162](https://github.com/pmd/pmd-eclipse-plugin/pull/162): Fix deprecations

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

@@ -24,7 +24,6 @@ Bundle-ClassPath: target/lib/antlr-runtime.jar,
  target/lib/antlr4-runtime.jar,
  target/lib/asm.jar,
  target/lib/common_2.13.jar,
- target/lib/commons-io.jar,
  target/lib/commons-lang3.jar,
  target/lib/fastparse_2.13.jar,
  target/lib/fastparse-utils_2.13.jar,

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/BaseVisitor.java

@@ -18,7 +18,6 @@
 import java.util.Set;
 import java.util.Stack;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -43,6 +42,7 @@
 import net.sourceforge.pmd.eclipse.runtime.properties.IProjectProperties;
 import net.sourceforge.pmd.eclipse.runtime.properties.PropertiesException;
 import net.sourceforge.pmd.eclipse.ui.actions.internal.InternalRuleSetUtil;
+import net.sourceforge.pmd.eclipse.util.internal.IOUtil;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
@@ -307,7 +307,7 @@ protected final void reviewResource(IResource resource) {
                 try (Reader input = new InputStreamReader(file.getContents(), file.getCharset());
                      PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration());) {
 
-                    String sourceContents = IOUtils.toString(input);
+                    String sourceContents = IOUtil.toString(input);
                     pmdAnalysis.files().addSourceFile(sourceContents, sourceCodeFile.getAbsolutePath());
 
                     pmdAnalysis.addRuleSets(getRuleSetList());

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewResourceForRuleCommand.java

@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.swt.widgets.Display;
@@ -23,6 +22,7 @@
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
+import net.sourceforge.pmd.eclipse.util.internal.IOUtil;
 
 /**
  * This command reviews a resource - a file - for a specific rule.
@@ -94,7 +94,7 @@ public void execute() {
                      PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration)) {
 
                     pmdAnalysis.addRuleSet(ruleSet);
-                    pmdAnalysis.files().addSourceFile(IOUtils.toString(input), sourceCodeFile.getAbsolutePath());
+                    pmdAnalysis.files().addSourceFile(IOUtil.toString(input), sourceCodeFile.getAbsolutePath());
 
                     report = pmdAnalysis.performAnalysisAndCollectReport();
                 } catch (Exception e) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java

@@ -7,7 +7,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
@@ -26,7 +27,6 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.commons.io.IOUtils;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -46,6 +46,7 @@
 import net.sourceforge.pmd.eclipse.runtime.properties.PropertiesException;
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
 import net.sourceforge.pmd.eclipse.ui.actions.internal.InternalRuleSetUtil;
+import net.sourceforge.pmd.eclipse.util.internal.IOUtil;
 
 /**
  * This class manages the persistence of the ProjectProperies information structure
@@ -191,8 +192,8 @@ private ProjectPropertiesTO readProjectProperties(final IProject project) throws
 
             final IFile propertiesFile = project.getFile(ProjectPropertiesTimestampTupel.PROPERTIES_FILE);
             if (propertiesFile.exists() && propertiesFile.isAccessible()) {
-                try (InputStream in = propertiesFile.getContents()) {
-                    String properties = IOUtils.toString(in, StandardCharsets.UTF_8);
+                try (Reader in = new InputStreamReader(propertiesFile.getContents(), StandardCharsets.UTF_8)) {
+                    String properties = IOUtil.toString(in);
                     projectProperties = convertProjectPropertiesFromString(properties);
                 }
             }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/util/internal/IOUtil.java

@@ -0,0 +1,25 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.eclipse.util.internal;
+
+import java.io.IOException;
+import java.io.Reader;
+
+public final class IOUtil {
+
+    private IOUtil() {}
+
+    public static String toString(Reader reader) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        char[] buffer = new char[8192];
+        int count = reader.read(buffer);
+        while (count > -1) {
+            sb.append(buffer, 0, count);
+            count = reader.read(buffer);
+        }
+        return sb.toString();
+    }
+}

pom.xml

@@ -21,13 +21,13 @@
     <java.version>1.7</java.version>
     <tycho.version>2.6.0</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <pmd.version>6.45.0</pmd.version>
+    <pmd.version>6.46.0</pmd.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
     <pmd.build-tools.version>17</pmd.build-tools.version>
     <checkstyle.version>9.3</checkstyle.version>
     <checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
     <pmd.plugin.version>3.15.0</pmd.plugin.version>
-    <pmd.check.version>6.45.0</pmd.check.version>
+    <pmd.check.version>6.46.0</pmd.check.version>
 
     <keystorePath>.ci/files/pmd-eclipse-plugin.p12</keystorePath>
     <keystore>${basedir}/${keystorePath}</keystore>