Skip to content

Commit 3f87723

Browse files
pwincklespwinckles
committed
update dependencies
1. Updates most dependencies, while trying to avoid potential breaking changes. 2. Removes commons-lang as a dependency of dxm, because it was only being used for ToStringBuilder.
1 parent 07c8891 commit 3f87723

File tree

12 files changed

+54
-78
lines changed

12 files changed

+54
-78
lines changed

‎dxm/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@
5757
<groupId>systems.uom</groupId>
5858
<artifactId>systems-unicode</artifactId>
5959
</dependency>
60-
<dependency>
61-
<groupId>commons-lang</groupId>
62-
<artifactId>commons-lang</artifactId>
63-
</dependency>
6460
<dependency>
6561
<groupId>commons-io</groupId>
6662
<artifactId>commons-io</artifactId>
@@ -73,7 +69,6 @@
7369
<dependency>
7470
<groupId>org.unitils</groupId>
7571
<artifactId>unitils-core</artifactId>
76-
<version>${unitils.version}</version>
7772
<scope>test</scope>
7873
</dependency>
7974
<dependency>

‎dxm/src/main/java/io/pcp/parfait/dxm/FileByteBufferFactory.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package io.pcp.parfait.dxm;
1818

19-
import org.apache.commons.lang.builder.ToStringBuilder;
20-
import org.apache.commons.lang.builder.ToStringStyle;
21-
2219
import java.io.File;
2320
import java.io.IOException;
2421
import java.io.RandomAccessFile;
@@ -71,7 +68,7 @@ public ByteBuffer build(int length) throws IOException {
7168
@Override
7269
public String toString() {
7370
try {
74-
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("file", file.getCanonicalPath()).toString();
71+
return "FileByteBufferFactory[file=" + file.getCanonicalPath() + ']';
7572
} catch (IOException e) {
7673
throw new RuntimeException(e);
7774
}

‎dxm/src/main/java/io/pcp/parfait/dxm/PcpMmvWriter.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
import io.pcp.parfait.dxm.types.TypeHandler;
5656
import com.google.common.base.Preconditions;
5757
import net.jcip.annotations.GuardedBy;
58-
import org.apache.commons.lang.builder.ToStringBuilder;
59-
import org.apache.commons.lang.builder.ToStringStyle;
6058

6159
/**
6260
* <p>
@@ -770,7 +768,6 @@ synchronized int size() {
770768

771769
@Override
772770
public String toString() {
773-
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("byteBufferFactory", this.byteBufferFactory).toString();
771+
return "PcpMmvWriter[byteBufferFactory=" + byteBufferFactory + ']';
774772
}
775-
776773
}

‎parfait-agent/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<dependency>
128128
<groupId>org.unitils</groupId>
129129
<artifactId>unitils-core</artifactId>
130-
<version>${unitils.version}</version>
131130
<scope>test</scope>
132131
</dependency>
133132
<dependency>
@@ -144,30 +143,9 @@
144143
<artifactId>parfait-pcp</artifactId>
145144
<version>${project.version}</version>
146145
</dependency>
147-
<dependency>
148-
<groupId>org.slf4j</groupId>
149-
<artifactId>slf4j-api</artifactId>
150-
<version>${slf4j.version}</version>
151-
</dependency>
152146
<dependency>
153147
<groupId>org.slf4j</groupId>
154148
<artifactId>slf4j-simple</artifactId>
155-
<version>${slf4j.version}</version>
156-
</dependency>
157-
<dependency>
158-
<groupId>com.fasterxml.jackson.core</groupId>
159-
<artifactId>jackson-core</artifactId>
160-
<version>${jackson.version}</version>
161-
</dependency>
162-
<dependency>
163-
<groupId>com.fasterxml.jackson.core</groupId>
164-
<artifactId>jackson-annotations</artifactId>
165-
<version>${jackson.version}</version>
166-
</dependency>
167-
<dependency>
168-
<groupId>com.fasterxml.jackson.core</groupId>
169-
<artifactId>jackson-databind</artifactId>
170-
<version>${jackson.version}</version>
171149
</dependency>
172150
<dependency>
173151
<groupId>org.mockito</groupId>

‎parfait-benchmark/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,9 @@
104104
<artifactId>jcommander</artifactId>
105105
<version>1.72</version>
106106
</dependency>
107+
<dependency>
108+
<groupId>org.apache.commons</groupId>
109+
<artifactId>commons-lang3</artifactId>
110+
</dependency>
107111
</dependencies>
108112
</project>

‎parfait-benchmark/src/main/java/io/pcp/parfait/benchmark/CPUThreadTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.beust.jcommander.Parameter;
3434
import com.google.common.base.Function;
3535
import com.google.common.collect.Lists;
36-
import org.apache.commons.lang.StringUtils;
36+
import org.apache.commons.lang3.StringUtils;
3737

3838
public class CPUThreadTest {
3939

‎parfait-benchmark/src/main/java/io/pcp/parfait/benchmark/ReportHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.net.UnknownHostException;
2222

23-
import org.apache.commons.lang.SystemUtils;
23+
import org.apache.commons.lang3.SystemUtils;
2424

2525
public class ReportHelper {
2626
static void environmentReportHeader() {

‎parfait-benchmark/src/main/java/io/pcp/parfait/benchmark/StandardMetricThroughPutBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import io.pcp.parfait.pcp.PcpMonitorBridge;
4141
import com.google.common.base.Function;
4242
import com.google.common.collect.Lists;
43-
import org.apache.commons.lang.StringUtils;
43+
import org.apache.commons.lang3.StringUtils;
4444

4545
public class StandardMetricThroughPutBenchmark {
4646

‎parfait-cxf/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<version>1.2.1-SNAPSHOT</version>
2323
</parent>
2424
<properties>
25-
<cxf.version>4.0.3</cxf.version>
25+
<cxf.version>4.0.5</cxf.version>
2626
</properties>
2727
<modelVersion>4.0.0</modelVersion>
2828
<groupId>io.pcp.parfait</groupId>
@@ -45,12 +45,12 @@
4545
<dependency>
4646
<groupId>org.springframework</groupId>
4747
<artifactId>spring-expression</artifactId>
48-
<version>5.2.20.RELEASE</version>
48+
<version>${spring.version}</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.springframework</groupId>
5252
<artifactId>spring-aop</artifactId>
53-
<version>3.0.5.RELEASE</version>
53+
<version>${spring.version}</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.apache.cxf</groupId>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>org.mortbay.jetty</groupId>
8080
<artifactId>jetty</artifactId>
81-
<version>6.1.23</version>
81+
<version>6.1.26</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<dependency>

‎parfait-dropwizard/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,11 @@
5757
<scope>test</scope>
5858
</dependency>
5959

60-
<dependency>
61-
<groupId>org.mockito</groupId>
62-
<artifactId>mockito-inline</artifactId>
63-
<scope>test</scope>
64-
</dependency>
65-
6660
<dependency>
6761
<groupId>io.dropwizard</groupId>
6862
<artifactId>dropwizard-configuration</artifactId>
6963
<version>${metrics3.version}</version>
7064
<scope>test</scope>
7165
</dependency>
72-
<dependency>
73-
<groupId>com.fasterxml.jackson.core</groupId>
74-
<artifactId>jackson-core</artifactId>
75-
<version>${jackson.version}</version>
76-
<scope>test</scope>
77-
</dependency>
7866
</dependencies>
7967
</project>

‎parfait-spring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.aspectj</groupId>
4747
<artifactId>aspectjweaver</artifactId>
48-
<version>1.9.6</version>
48+
<version>1.9.22.1</version>
4949
<scope>compile</scope>
5050
</dependency>
5151
<dependency>

‎pom.xml

+40-23
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,21 @@
103103
<properties>
104104
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
105105
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
106-
<spring.version>5.3.27</spring.version>
107-
<slf4j.version>1.6.1</slf4j.version>
106+
<spring.version>5.3.39</spring.version>
107+
<slf4j.version>1.7.36</slf4j.version>
108108
<jdk.version>1.8</jdk.version>
109109
<project.build.javaVersion>${jdk.version}</project.build.javaVersion>
110110
<maven.compile.targetLevel>${jdk.version}</maven.compile.targetLevel>
111111
<maven.compile.sourceLevel>${jdk.version}</maven.compile.sourceLevel>
112112
<java.major.source.version>${jdk.version}</java.major.source.version>
113113
<java.major.target.version>${jdk.version}</java.major.target.version>
114-
<metrics3.version>2.0.13</metrics3.version>
115-
<unit.version>2.0</unit.version>
116-
<unit.ri.version>2.0.4</unit.ri.version>
117-
<unit.systems.version>2.0.2</unit.systems.version>
118-
<unitils.version>3.4.3</unitils.version>
119-
<jackson.version>2.16.0</jackson.version>
120-
<mockito.version>4.3.1</mockito.version>
114+
<metrics3.version>2.0.35</metrics3.version>
115+
<unit.version>2.2</unit.version>
116+
<unit.ri.version>2.2</unit.ri.version>
117+
<unit.systems.version>2.1</unit.systems.version>
118+
<unitils.version>3.4.6</unitils.version>
119+
<jackson.version>2.17.2</jackson.version>
120+
<mockito.version>5.13.0</mockito.version>
121121
<license-maven-plugin.version>3.0</license-maven-plugin.version>
122122
</properties>
123123

@@ -372,21 +372,21 @@
372372
<artifactId>slf4j-api</artifactId>
373373
<version>${slf4j.version}</version>
374374
</dependency>
375+
<dependency>
376+
<groupId>org.slf4j</groupId>
377+
<artifactId>slf4j-simple</artifactId>
378+
<version>${slf4j.version}</version>
379+
</dependency>
375380
<dependency>
376381
<groupId>com.google.guava</groupId>
377382
<artifactId>guava</artifactId>
378-
<version>32.1.3-jre</version>
383+
<version>33.3.0-jre</version>
379384
</dependency>
380385
<dependency>
381386
<groupId>org.mockito</groupId>
382387
<artifactId>mockito-core</artifactId>
383388
<version>${mockito.version}</version>
384389
</dependency>
385-
<dependency>
386-
<groupId>org.mockito</groupId>
387-
<artifactId>mockito-inline</artifactId>
388-
<version>${mockito.version}</version>
389-
</dependency>
390390
<dependency>
391391
<groupId>net.jcip</groupId>
392392
<artifactId>jcip-annotations</artifactId>
@@ -395,12 +395,12 @@
395395
<dependency>
396396
<groupId>commons-io</groupId>
397397
<artifactId>commons-io</artifactId>
398-
<version>2.7</version>
398+
<version>2.16.1</version>
399399
</dependency>
400400
<dependency>
401-
<groupId>commons-lang</groupId>
402-
<artifactId>commons-lang</artifactId>
403-
<version>2.6</version>
401+
<groupId>org.apache.commons</groupId>
402+
<artifactId>commons-lang3</artifactId>
403+
<version>3.16.0</version>
404404
</dependency>
405405
<dependency>
406406
<groupId>org.springframework</groupId>
@@ -422,14 +422,34 @@
422422
<artifactId>hamcrest-all</artifactId>
423423
<version>1.3</version>
424424
</dependency>
425+
<dependency>
426+
<groupId>org.unitils</groupId>
427+
<artifactId>unitils-core</artifactId>
428+
<version>${unitils.version}</version>
429+
</dependency>
430+
<dependency>
431+
<groupId>com.fasterxml.jackson.core</groupId>
432+
<artifactId>jackson-core</artifactId>
433+
<version>${jackson.version}</version>
434+
</dependency>
435+
<dependency>
436+
<groupId>com.fasterxml.jackson.core</groupId>
437+
<artifactId>jackson-annotations</artifactId>
438+
<version>${jackson.version}</version>
439+
</dependency>
440+
<dependency>
441+
<groupId>com.fasterxml.jackson.core</groupId>
442+
<artifactId>jackson-databind</artifactId>
443+
<version>${jackson.version}</version>
444+
</dependency>
425445
</dependencies>
426446
</dependencyManagement>
427447

428448
<dependencies>
429449
<dependency>
430450
<groupId>junit</groupId>
431451
<artifactId>junit</artifactId>
432-
<version>4.13.1</version>
452+
<version>4.13.2</version>
433453
<type>jar</type>
434454
<scope>test</scope>
435455
</dependency>
@@ -440,17 +460,14 @@
440460
<dependency>
441461
<groupId>com.fasterxml.jackson.core</groupId>
442462
<artifactId>jackson-core</artifactId>
443-
<version>${jackson.version}</version>
444463
</dependency>
445464
<dependency>
446465
<groupId>com.fasterxml.jackson.core</groupId>
447466
<artifactId>jackson-annotations</artifactId>
448-
<version>${jackson.version}</version>
449467
</dependency>
450468
<dependency>
451469
<groupId>com.fasterxml.jackson.core</groupId>
452470
<artifactId>jackson-databind</artifactId>
453-
<version>${jackson.version}</version>
454471
</dependency>
455472
</dependencies>
456473
<repositories>

0 commit comments

Comments
 (0)