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

Jump to bottom

deps: bumps to latest zipkin, aws sdk and moshi #216

Merged
merged 1 commit into from
Feb 11, 2024
Merged

deps: bumps to latest zipkin, aws sdk and moshi #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 aws-junit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>org.elasticmq</groupId>
<artifactId>elasticmq-server_2.13</artifactId>
<version>1.5.6</version>
<version>1.5.7</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only CVE trivy detects is a slightly out of date scala that this doesn't fix. however, not interested in overriding anything over a test lib not used elsewhere.

<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down
2 changes: 1 addition & 1 deletion collector/kinesis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-client</artifactId>
<version>1.15.0</version>
<version>1.15.1</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#

# zipkin version should match zipkin.version in /pom.xml
ARG zipkin_version=3.0.5
ARG zipkin_version=3.0.6

# java_version is used during the installation process to build or download the module jar.
#
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
<!-- matching armeria/grpc/zipkin -->
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
<zipkin.version>3.0.5</zipkin.version>
<zipkin.version>3.0.6</zipkin.version>
<zipkin-reporter.version>3.2.1</zipkin-reporter.version>
<spring-boot.version>3.2.2</spring-boot.version>
<jackson.version>2.16.1</jackson.version>
<!-- armeria.groupId allows you to test feature branches with jitpack -->
<!-- This allows you to test feature branches with jitpack -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at some point I will remove all this stuff as I think jitpack is not really healthy (at least last time I tried it)

<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.26.4</armeria.version>
<armeria.version>1.27.1</armeria.version>
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
<netty.version>4.1.100.Final</netty.version>
<netty.version>4.1.106.Final</netty.version>
<log4j.version>2.21.1</log4j.version>

<!-- This allows you to test feature branches with jitpack -->
Expand All @@ -95,15 +95,15 @@
<brave.groupId>io.zipkin.brave</brave.groupId>
<brave.version>6.0.0</brave.version>

<aws-java-sdk.version>1.12.643</aws-java-sdk.version>
<sdk-core.version>2.23.9</sdk-core.version>
<aws-java-sdk.version>1.12.656</aws-java-sdk.version>
<sdk-core.version>2.24.0</sdk-core.version>

<okhttp.version>4.12.0</okhttp.version>

<assertj.version>3.25.1</assertj.version>
<assertj.version>3.25.3</assertj.version>
<awaitility.version>4.2.0</awaitility.version>
<junit-jupiter.version>5.10.1</junit-jupiter.version>
<mockito.version>5.9.0</mockito.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<mockito.version>5.10.0</mockito.version>

<!-- override to set exclusions per-project -->
<errorprone.args />
Expand Down
2 changes: 1 addition & 1 deletion storage/xray-udp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.squareup.moshi</groupId>
<artifactId>moshi</artifactId>
<version>1.15.0</version>
<version>1.15.1</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
Expand Down
Loading