Merge pull request #21 from paypal/issue-20-upgrade-libraries

Upgrade commons-io, commons-lang3, commons-text, junit-pioneer, picocli to latest versions

Author: maxxedev

pom.xml

@@ -46,11 +46,12 @@
 
         <!-- Dependency versions -->
         <commons-compress.version>1.26.0</commons-compress.version>
-        <commons-io.version>2.11.0</commons-io.version>
-        <commons-text.version>1.10.0</commons-text.version>
-        <junit-pioneer.version>1.5.0</junit-pioneer.version>
+        <commons-io.version>2.15.1</commons-io.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
+        <commons-text.version>1.11.0</commons-text.version>
+        <junit-pioneer.version>1.9.1</junit-pioneer.version>
         <meanbean.version>3.0.0-M9</meanbean.version>
-        <picocli.version>4.6.2</picocli.version>
+        <picocli.version>4.7.5</picocli.version>
     </properties>
 
     <licenses>
@@ -84,6 +85,12 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

src/main/java/com/paypal/heapdumptool/capture/CaptureStreamFactory.java

@@ -12,7 +12,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.Objects.requireNonNull;
-import static org.apache.commons.compress.utils.IOUtils.closeQuietly;
+import static org.apache.commons.io.IOUtils.closeQuietly;
 
 public class CaptureStreamFactory extends SanitizeStreamFactory implements Closeable {
 

src/main/java/com/paypal/heapdumptool/sanitizer/SanitizeStreamFactory.java

@@ -35,7 +35,7 @@ public InputStream newInputStream() throws IOException {
 
         if (command.isTarInput()) {
             final TarArchiveInputStream tarStream = new TarArchiveInputStream(inputStream);
-            Validate.notNull(tarStream.getNextTarEntry(), "no tar entries");
+            Validate.notNull(tarStream.getNextEntry(), "no tar entries");
             return tarStream;
         }
         return inputStream;

src/test/java/com/paypal/heapdumptool/capture/CaptureCommandProcessorTest.java

@@ -5,6 +5,7 @@
 import com.paypal.heapdumptool.utils.ProcessTool;
 import com.paypal.heapdumptool.utils.ProcessTool.ProcessResult;
 import org.apache.commons.io.input.NullInputStream;
+import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.lang3.ArrayUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -20,7 +21,6 @@
 import java.util.stream.Stream;
 
 import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.Answers.CALLS_REAL_METHODS;
@@ -153,7 +153,7 @@ private ProcessBuilder dockerCpProcess() throws IOException {
         doReturn(process).when(processBuilder).start();
         doReturn(nullInputStream).when(process).getInputStream();
         doReturn(nullInputStream).when(process).getErrorStream();
-        doReturn(NULL_OUTPUT_STREAM).when(process).getOutputStream();
+        doReturn(NullOutputStream.INSTANCE).when(process).getOutputStream();
 
         return processBuilder;
     }

src/test/java/com/paypal/heapdumptool/capture/CaptureStreamFactoryTest.java

@@ -1,7 +1,7 @@
 package com.paypal.heapdumptool.capture;
 
 import com.paypal.heapdumptool.sanitizer.SanitizeCommand;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.CloseShieldOutputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DynamicTest;

src/test/resources/files/ApplicationTest/help.txt

@@ -6,4 +6,4 @@ Commands:
   capture         Capture sanitized heap dump of a containerized app
   sanitize        Sanitize a heap dump by replacing byte and char array contents
   sanitize-hserr  Sanitize fatal error log by censoring environment variable values
-  help            Displays help information about the specified command
+  help            Display help information about the specified command.