Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernize dependencies #239

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Modernize dependencies #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f16e10c
Modernize dependencies and format
thiagocesarj Dec 12, 2023
23bd505
Modernize dependencies and format
thiagocesarj Dec 12, 2023
08d4884
Modernize dependencies and format
thiagocesarj Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion folsom-micrometer-metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>1.10.3</version>
<version>1.12.0</version>
</dependency>


Expand Down
2 changes: 1 addition & 1 deletion folsom-opencensus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.1</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions folsom-opencensus/src/test/java/com/spotify/folsom/opencensus/OpenCensusSpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -82,6 +82,6 @@ public void nullValue() {
final Span span = new OpenCensusSpan(wrapped, true);
span.value(null);

verifyZeroInteractions(wrapped);
verifyNoInteractions(wrapped);
}
}
4 changes: 2 additions & 2 deletions folsom-opentelemetry-metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.29.0</version>
<version>1.33.0</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<version>1.29.0</version>
<version>1.33.0</version>
<scope>test</scope>
</dependency>

Expand Down
24 changes: 12 additions & 12 deletions folsom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
<name>folsom</name>

<properties>
<netty.version>4.1.87.Final</netty.version>
<netty.version>4.1.101.Final</netty.version>
</properties>

<dependencies>
<dependency>
<groupId>com.spotify</groupId>
<artifactId>completable-futures</artifactId>
<version>0.3.2</version>
<version>0.3.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1.1-android</version>
<version>32.1.3-android</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>2.0.9</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand All @@ -53,9 +53,9 @@
<version>3.1.5</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>

<!-- Tests -->
Expand All @@ -67,7 +67,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.14</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -95,20 +95,20 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.spotify</groupId>
<artifactId>hamcrest-future</artifactId>
<version>1.0.1</version>
<version>1.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>2.6.0</version>
<version>2.12.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion folsom/src/main/java/com/spotify/folsom/transcoder/SerializableObjectTranscoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<T extends Serializable> implements Transcoder<T> {

Expand Down
4 changes: 2 additions & 2 deletions folsom/src/test/java/com/spotify/folsom/reconnect/ReconnectingClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -57,7 +57,7 @@ public class ReconnectingClientTest {
@Before
public void setUp() throws Exception {
when(scheduledExecutorService.schedule(
Mockito.<Runnable>any(), anyLong(), Matchers.<TimeUnit>any()))
Mockito.<Runnable>any(), anyLong(), ArgumentMatchers.<TimeUnit>any()))
.thenAnswer(
(Answer<Object>)
invocationOnMock -> {
Expand Down
33 changes: 18 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,22 @@
<dependency>
<groupId>com.spotify.metrics</groupId>
<artifactId>semantic-metrics-core</artifactId>
<version>1.0.2</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.11.2</version>
<version>4.11.0</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.16.3</version>
<version>1.19.3</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -137,7 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.6.3</version>
<configuration>
<show>private</show>
</configuration>
Expand All @@ -153,15 +153,15 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>3.0.1</version>
<version>4.3.0</version>
<configuration>
<repoToken>${coveralls.token}</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.5.1</version>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.5.1</version>
<executions>
<execution>
<goals>
Expand All @@ -176,7 +176,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -191,9 +191,12 @@
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<version>1.8.0</version>
<version>2.7.0</version>
<configuration>
<javaVersion>1.8</javaVersion>
<ignoreClassNamePatterns>
<ignoreClassNamePattern>com.spotify.folsom.client.Utils.*</ignoreClassNamePattern>
</ignoreClassNamePatterns>
</configuration>
<executions>
<execution>
Expand All @@ -210,7 +213,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-java</id>
Expand All @@ -234,7 +237,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
<version>2.16.2</version>
<configuration>
<processAllModules>true</processAllModules>
</configuration>
Expand Down