Skip to content

Commit 06ebac6

Browse files
committed
Upgrade libraries and plugins
1 parent bc793c7 commit 06ebac6

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

pom.xml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,28 @@
2626
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
2727
<jgitflow-maven-plugin.version>1.0-m5.1</jgitflow-maven-plugin.version>
2828
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format>
29-
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
30-
<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
31-
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
29+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
30+
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
31+
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
3232
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
33-
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
34-
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
33+
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
34+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
3535
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
36-
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
36+
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
3939

4040
<!-- Specify all SonarQube code coverage reports - default does not pick up integration tests -->
4141
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml,target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
4242

43-
<slf4j.version>2.0.12</slf4j.version>
43+
<slf4j.version>2.0.16</slf4j.version>
4444
<spring-boot.version>2.7.18</spring-boot.version>
4545
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
4646

4747
<!-- Dependency versions -->
48-
<commons-compress.version>1.26.0</commons-compress.version>
49-
<commons-io.version>2.15.1</commons-io.version>
50-
<commons-lang3.version>3.14.0</commons-lang3.version>
51-
<commons-text.version>1.11.0</commons-text.version>
48+
<commons-compress.version>1.27.1</commons-compress.version>
49+
<commons-lang3.version>3.17.0</commons-lang3.version>
50+
<commons-text.version>1.13.0</commons-text.version>
5251
<junit-pioneer.version>1.9.1</junit-pioneer.version>
5352
<meanbean.version>3.0.0-M9</meanbean.version>
5453
<picocli.version>4.7.5</picocli.version>
@@ -121,12 +120,6 @@
121120
<version>${commons-compress.version}</version>
122121
</dependency>
123122

124-
<dependency>
125-
<groupId>commons-io</groupId>
126-
<artifactId>commons-io</artifactId>
127-
<version>${commons-io.version}</version>
128-
</dependency>
129-
130123
<dependency>
131124
<groupId>org.apache.commons</groupId>
132125
<artifactId>commons-text</artifactId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ private Pipe(final DataInputStream input, final DataOutputStream output, final I
3535
/**
3636
* Creates a copy of this pipe where only up to give count of bytes can read from input stream
3737
*/
38+
@SuppressWarnings("deprecation")
3839
public Pipe newInputBoundedPipe(final long inputCount) {
3940
final DataInputStream boundedInput = new DataInputStream(new BoundedInputStream(input, inputCount));
4041
return new Pipe(boundedInput, output, idSize);

src/main/java/com/paypal/heapdumptool/utils/InternalLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class InternalLogger {
2323

2424
private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss,SSS");
2525

26-
private static final PrintStream out = System.out;
26+
private final PrintStream out = System.out;
2727

2828
private final String clazz;
2929

src/main/java/com/paypal/heapdumptool/utils/ProgressMonitor.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import com.paypal.heapdumptool.sanitizer.DataSize;
44
import org.apache.commons.io.FileUtils;
5-
import org.apache.commons.io.input.CountingInputStream;
5+
import org.apache.commons.io.input.BoundedInputStream;
66
import org.apache.commons.io.output.CountingOutputStream;
77
import org.apache.commons.lang3.mutable.MutableLong;
88

9+
import java.io.IOException;
910
import java.io.InputStream;
1011
import java.io.OutputStream;
12+
import java.io.UncheckedIOException;
1113
import java.util.function.Consumer;
1214

1315
@FunctionalInterface
@@ -47,14 +49,19 @@ protected void beforeWrite(final int n) {
4749
/**
4850
* Create a OutputStream monitored by this
4951
*/
52+
@SuppressWarnings("deprecation")
5053
default InputStream monitoredInputStream(final InputStream input) {
5154
final ProgressMonitor monitor = this;
52-
return new CountingInputStream(input) {
55+
return new BoundedInputStream(input) {
5356

5457
@Override
55-
protected void afterRead(final int n) {
56-
super.afterRead(n);
57-
monitor.accept(getByteCount());
58+
public void afterRead(final int n) {
59+
try {
60+
super.afterRead(n);
61+
} catch (final IOException e) {
62+
throw new UncheckedIOException(e);
63+
}
64+
monitor.accept(getCount());
5865
}
5966
};
6067
}

0 commit comments

Comments
 (0)