From ae3fec5e80e27261345e65e39ca623cd7e966aa9 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@tetrate.io>
Date: Sun, 26 May 2024 08:26:12 +0800
Subject: [PATCH] bumps dependencies, notable to zipkin 3.4 and spring boot 3.3

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 docker/Dockerfile |  4 ++--
 pom.xml           | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5fcabbd..053084f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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.
diff --git a/pom.xml b/pom.xml
index 6704eef..86aa45b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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 -->
@@ -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>
@@ -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>