Skip to content

Commit

Permalink
bumps dependencies, notable to zipkin 3.4 and spring boot 3.3
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
Adrian Cole committed May 26, 2024
1 parent 3df50e5 commit ae3fec5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
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.3.0
ARG zipkin_version=3.4.0

# 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.2_p13
ARG java_version=21.0.3_p9

# 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
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.3.0</zipkin.version>
<zipkin.version>3.4.0</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<spring-boot.version>3.2.4</spring-boot.version>
<spring-boot.version>3.3.0</spring-boot.version>
<!-- armeria.groupId allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.28.0</armeria.version>
<armeria.version>1.28.4</armeria.version>
<log4j.version>2.23.1</log4j.version>

<!-- This allows you to test feature branches with jitpack -->
Expand All @@ -87,22 +87,22 @@

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

<!-- pubsub deps -->
<google-cloud-pubsub.version>1.128.1</google-cloud-pubsub.version>
<grpc-google-cloud-pubsub-v1.version>1.110.1</grpc-google-cloud-pubsub-v1.version>
<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>

<assertj.version>3.25.3</assertj.version>
<awaitility.version>4.2.1</awaitility.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<mockito.version>5.11.0</mockito.version>
<mockito.version>5.12.0</mockito.version>

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

<license.skip>${skipTests}</license.skip>
Expand Down Expand Up @@ -569,7 +569,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.3</version>
<version>3.2.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit ae3fec5

Please sign in to comment.