commit 782ebf08d5efc109a5a0f7f57c0da923b68741dd
author Elliotte Rusty Harold <elharo@users.noreply.github.com> Tue Dec 01 00:30:24 2020 +0000
committer GitHub <noreply@github.com> Tue Dec 01 00:30:24 2020 +0000
tree 8e35313c9d90ca939528e02e5fbee1bc1b726a01
parent b5dddba040be0efc0930a452c8e3363a554c9205
parent 3cdf81a2c4f0602f92558107501484b3ea5733b1

Merge pull request #38 from apache/deps

update shared utils

pom.xml

diff --git a/pom.xml b/pom.xml
index c113feb..f91c663 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
     <doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
     <javaVersion>7</javaVersion><!-- Because PMD 5.4+ requires Java 7 -->
     <pmdVersion>6.29.0</pmdVersion>
+    <slf4jVersion>1.7.25</slf4jVersion>
     <sitePluginVersion>3.7.1</sitePluginVersion>
     <projectInfoReportsPluginVersion>3.0.0</projectInfoReportsPluginVersion>
     <project.build.outputTimestamp>2020-10-24T17:10:38Z</project.build.outputTimestamp>
@@ -133,17 +134,17 @@
       <version>3.1.0</version>
     </dependency>
     <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-embedder</artifactId>
-        <version>3.1.0</version>
-        <scope>provided</scope>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-embedder</artifactId>
+      <version>3.1.0</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- pmd -->
     <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.8.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.pmd</groupId>
@@ -166,11 +167,16 @@
       <version>${pmdVersion}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4jVersion}</version>
+    </dependency>
     <!-- Support logging of PMD through slf4j. See also MPMD-244 -->
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
-        <version>1.7.25</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>${slf4jVersion}</version>
     </dependency>
 
     <!-- doxia -->
@@ -246,13 +252,13 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.5</version>
+      <version>2.6</version>
       <!-- scope>test</scope> Required by PMD transitively. -->
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.5</version>
+      <version>${slf4jVersion}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java

diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
index b6f1603..eae9253 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/PmdExecutor.java
@@ -34,7 +34,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.pmd.ExcludeViolationsFromFile;
@@ -267,7 +266,15 @@
                     ClassLoader classLoader = configuration.getClassLoader();
                     if ( classLoader instanceof Closeable )
                     {
-                        IOUtils.closeQuietly( (Closeable) classLoader );
+                        Closeable closeable = (Closeable) classLoader;
+                        try
+                        {
+                            closeable.close();
+                        }
+                        catch ( IOException ex )
+                        {
+                            // ignore
+                        }
                     }
                 }
                 if ( request.getBenchmarkOutputLocation() != null )