diff --git a/folsom-micrometer-metrics/pom.xml b/folsom-micrometer-metrics/pom.xml index 941cb01f..095ff4b1 100644 --- a/folsom-micrometer-metrics/pom.xml +++ b/folsom-micrometer-metrics/pom.xml @@ -19,7 +19,7 @@ io.micrometer micrometer-core - 1.10.3 + 1.12.0 diff --git a/folsom-opencensus/pom.xml b/folsom-opencensus/pom.xml index eefb9984..b2f8c03a 100644 --- a/folsom-opencensus/pom.xml +++ b/folsom-opencensus/pom.xml @@ -45,7 +45,7 @@ org.hamcrest hamcrest - 2.1 + 2.2 test diff --git a/folsom-opencensus/src/test/java/com/spotify/folsom/opencensus/OpenCensusSpanTest.java b/folsom-opencensus/src/test/java/com/spotify/folsom/opencensus/OpenCensusSpanTest.java index 4da1e755..41cd4aa3 100644 --- a/folsom-opencensus/src/test/java/com/spotify/folsom/opencensus/OpenCensusSpanTest.java +++ b/folsom-opencensus/src/test/java/com/spotify/folsom/opencensus/OpenCensusSpanTest.java @@ -20,7 +20,7 @@ import static io.opencensus.trace.AttributeValue.stringAttributeValue; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import com.google.common.io.BaseEncoding; import com.spotify.folsom.Span; @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class OpenCensusSpanTest { @@ -82,6 +82,6 @@ public void nullValue() { final Span span = new OpenCensusSpan(wrapped, true); span.value(null); - verifyZeroInteractions(wrapped); + verifyNoInteractions(wrapped); } } diff --git a/folsom-opentelemetry-metrics/pom.xml b/folsom-opentelemetry-metrics/pom.xml index 6bca1695..82b3adf1 100644 --- a/folsom-opentelemetry-metrics/pom.xml +++ b/folsom-opentelemetry-metrics/pom.xml @@ -19,12 +19,12 @@ io.opentelemetry opentelemetry-api - 1.29.0 + 1.33.0 io.opentelemetry opentelemetry-sdk-testing - 1.29.0 + 1.33.0 test diff --git a/folsom/pom.xml b/folsom/pom.xml index 6ae2de76..1a8fe5bd 100644 --- a/folsom/pom.xml +++ b/folsom/pom.xml @@ -13,24 +13,24 @@ folsom - 4.1.87.Final + 4.1.101.Final com.spotify completable-futures - 0.3.2 + 0.3.5 com.google.guava guava - 30.1.1-android + 32.1.3-android org.slf4j slf4j-api - 1.7.36 + 2.0.9 io.netty @@ -53,9 +53,9 @@ 3.1.5 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.14.0 @@ -67,7 +67,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.3.14 test @@ -95,20 +95,20 @@ org.hamcrest - hamcrest-library - 1.3 + hamcrest + 2.2 test com.spotify hamcrest-future - 1.0.1 + 1.3.2 test org.jmock jmock - 2.6.0 + 2.12.0 test diff --git a/folsom/src/main/java/com/spotify/folsom/transcoder/SerializableObjectTranscoder.java b/folsom/src/main/java/com/spotify/folsom/transcoder/SerializableObjectTranscoder.java index 686d207e..98365b03 100644 --- a/folsom/src/main/java/com/spotify/folsom/transcoder/SerializableObjectTranscoder.java +++ b/folsom/src/main/java/com/spotify/folsom/transcoder/SerializableObjectTranscoder.java @@ -18,7 +18,7 @@ import com.spotify.folsom.Transcoder; import java.io.Serializable; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; public final class SerializableObjectTranscoder implements Transcoder { diff --git a/folsom/src/test/java/com/spotify/folsom/reconnect/ReconnectingClientTest.java b/folsom/src/test/java/com/spotify/folsom/reconnect/ReconnectingClientTest.java index 4d6c3857..da1db271 100644 --- a/folsom/src/test/java/com/spotify/folsom/reconnect/ReconnectingClientTest.java +++ b/folsom/src/test/java/com/spotify/folsom/reconnect/ReconnectingClientTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.TimeoutException; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.mockito.stubbing.Answer; @@ -57,7 +57,7 @@ public class ReconnectingClientTest { @Before public void setUp() throws Exception { when(scheduledExecutorService.schedule( - Mockito.any(), anyLong(), Matchers.any())) + Mockito.any(), anyLong(), ArgumentMatchers.any())) .thenAnswer( (Answer) invocationOnMock -> { diff --git a/pom.xml b/pom.xml index 559ced5c..ca2ab789 100644 --- a/pom.xml +++ b/pom.xml @@ -80,22 +80,22 @@ com.spotify.metrics semantic-metrics-core - 1.0.2 + 1.2.0 junit junit - 4.13.1 + 4.13.2 org.mockito mockito-core - 3.11.2 + 4.11.0 org.testcontainers testcontainers - 1.16.3 + 1.19.3 @@ -115,7 +115,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.11.0 1.8 1.8 @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2 + 3.3.0 attach-sources @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0-M1 + 3.6.3 private @@ -153,15 +153,15 @@ org.eluder.coveralls coveralls-maven-plugin - 3.0.1 + 4.3.0 ${coveralls.token} - com.coveo - fmt-maven-plugin - 2.5.1 + com.coveo + fmt-maven-plugin + 2.5.1 @@ -176,7 +176,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.3 + 1.6.13 true ossrh @@ -191,9 +191,12 @@ org.gaul modernizer-maven-plugin - 1.8.0 + 2.7.0 1.8 + + com.spotify.folsom.client.Utils.* + @@ -210,7 +213,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.4.1 enforce-java @@ -234,7 +237,7 @@ org.codehaus.mojo versions-maven-plugin - 2.5 + 2.16.2 true