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

Bumps dependencies #226

Merged
merged 1 commit into from
Aug 31, 2024
+12 −12
Merged

Bumps dependencies #226

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
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#

# zipkin version should match zipkin.version in /pom.xml
ARG zipkin_version=3.4.0
ARG zipkin_version=3.4.1

# java_version is used during the installation process to build or download the module jar.
#
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
# This is defined in many places because Docker has no "env" script functionality unless you use
# docker-compose: When updating, update everywhere.
ARG java_version=21.0.3_p9
ARG java_version=21.0.4_p7

# We copy files from the context into a scratch container first to avoid a problem where docker and
# docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
Expand Down
20 changes: 10 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
<!-- 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.4.0</zipkin.version>
<zipkin.version>3.4.1</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<spring-boot.version>3.3.0</spring-boot.version>
<spring-boot.version>3.3.3</spring-boot.version>
<!-- armeria.groupId allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.28.4</armeria.version>
<armeria.version>1.29.4</armeria.version>
<log4j.version>2.23.1</log4j.version>

<!-- This allows you to test feature branches with jitpack -->
Expand All @@ -80,20 +80,20 @@
<brave.version>6.0.3</brave.version>

<!-- from armeria-grpc or grpc-google-cloud-trace-v1 whichever is higher -->
<grpc.version>1.63.0</grpc.version>
<grpc.version>1.66.0</grpc.version>
<!-- from grpc-protobuf -->
<protobuf.version>3.25.1</protobuf.version>
<protobuf.version>3.25.3</protobuf.version>
<guava.version>32.1.3</guava.version>

<!-- stackdriver deps -->
<google-auth-library-oauth2-http.version>1.23.0</google-auth-library-oauth2-http.version>
<proto-google-common-protos.version>2.39.1</proto-google-common-protos.version>
<proto-google-common-protos.version>2.43.0</proto-google-common-protos.version>
<!-- only used for stackdriver protos, we could possibly obviate this if a problem -->
<grpc-google-cloud-trace.version>2.44.0</grpc-google-cloud-trace.version>
<grpc-google-cloud-trace.version>2.48.0</grpc-google-cloud-trace.version>

<!-- pubsub deps -->
<google-cloud-pubsub.version>1.129.6</google-cloud-pubsub.version>
<grpc-google-cloud-pubsub-v1.version>1.111.6</grpc-google-cloud-pubsub-v1.version>
<google-cloud-pubsub.version>1.132.1</google-cloud-pubsub.version>
<grpc-google-cloud-pubsub-v1.version>1.114.1</grpc-google-cloud-pubsub-v1.version>

<assertj.version>3.25.3</assertj.version>
<awaitility.version>4.2.1</awaitility.version>
Expand All @@ -102,7 +102,7 @@

<!-- override to set exclusions per-project -->
<errorprone.args />
<errorprone.version>2.27.1</errorprone.version>
<errorprone.version>2.30.0</errorprone.version>
<auto-value.version>1.10.4</auto-value.version>

<license.skip>${skipTests}</license.skip>
Expand Down
Loading