Skip to content

Commit

Permalink
deps: updates to zipkin 3.2.1 versions (#219)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt committed Apr 13, 2024
1 parent 96dd2f6 commit e930280
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
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.6
ARG zipkin_version=3.2.1

# java_version is used during the installation process to build or download the module jar.
#
Expand Down
36 changes: 18 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,44 +74,44 @@
<!-- 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.6</zipkin.version>
<zipkin-reporter.version>3.3.0</zipkin-reporter.version>
<spring-boot.version>3.2.2</spring-boot.version>
<zipkin.version>3.2.1</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<spring-boot.version>3.2.4</spring-boot.version>
<!-- armeria.groupId allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.27.1</armeria.version>
<log4j.version>2.21.1</log4j.version>
<armeria.version>1.28.0</armeria.version>
<log4j.version>2.23.1</log4j.version>

<!-- This allows you to test feature branches with jitpack -->
<!-- <brave.groupId>com.github.openzipkin.brave</brave.groupId>-->
<!-- <brave.version>master-SNAPSHOT</brave.version>-->
<brave.groupId>io.zipkin.brave</brave.groupId>
<brave.version>6.0.0</brave.version>
<brave.version>6.0.3</brave.version>

<!-- from armeria-grpc or grpc-google-cloud-trace-v1 whichever is higher -->
<grpc.version>1.61.1</grpc.version>
<grpc.version>1.63.0</grpc.version>
<!-- from grpc-protobuf -->
<protobuf.version>3.25.1</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.34.0</proto-google-common-protos.version>
<proto-google-common-protos.version>2.37.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.35.0</grpc-google-cloud-trace.version>
<grpc-google-cloud-trace.version>2.41.0</grpc-google-cloud-trace.version>

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

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

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

<license.skip>${skipTests}</license.skip>
Expand All @@ -123,7 +123,7 @@
<!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
<license-maven-plugin.version>4.3</license-maven-plugin.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<!-- Use same version as https://github.com/openzipkin/docker-java -->
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
Expand All @@ -134,8 +134,8 @@
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
</properties>
Expand Down Expand Up @@ -578,7 +578,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.3</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit e930280

Please sign in to comment.