From c30ef2fca1a501f8930ce9adb6a5ad184d67d321 Mon Sep 17 00:00:00 2001
From: Andriy Redko <drreta@gmail.com>
Date: Thu, 5 Sep 2024 21:36:29 -0400
Subject: [PATCH] Routine dependency updates (#223)

Signed-off-by: Andriy Redko <drreta@gmail.com>
---
 build-bin/docker/docker_test_image |  6 +++---
 pom.xml                            | 32 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/build-bin/docker/docker_test_image b/build-bin/docker/docker_test_image
index fad9da0d..9d725c61 100755
--- a/build-bin/docker/docker_test_image
+++ b/build-bin/docker/docker_test_image
@@ -20,7 +20,7 @@ docker_container=${3:-sut}
 # First try to run the intended containers.
 health_rc=0
 if test -f "${docker_compose_file}"; then
-  docker-compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1
+  docker compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1
 else
   docker run --name ${docker_container} -d ${DOCKER_IMAGE} || health_rc=1
 fi
@@ -36,7 +36,7 @@ if [ "${health_rc}" = "1" ] || ! build-bin/docker/docker_block_on_health ${docke
 
   # Log any containers output to console before we remove them.
   if test -f "${docker_compose_file}"; then
-    docker-compose -f "${docker_compose_file}" logs
+    docker compose -f "${docker_compose_file}" logs
   else
     docker logs ${docker_container} || true
   fi
@@ -45,7 +45,7 @@ fi
 
 # Clean up any containers, so that we can run this again without conflict.
 if test -f "${docker_compose_file}"; then
-  docker-compose -f "${docker_compose_file}" down
+  docker compose -f "${docker_compose_file}" down
 else
   docker kill ${docker_container} && docker rm ${docker_container}
 fi
diff --git a/pom.xml b/pom.xml
index b2ed27fa..2cc79fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,15 +69,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.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>
-    <jackson.version>2.17.1</jackson.version>
+    <spring-boot.version>3.3.3</spring-boot.version>
+    <jackson.version>2.17.2</jackson.version>
     <!-- This allows you to test feature branches with jitpack -->
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
     <armeria.version>1.28.4</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
-    <netty.version>4.1.110.Final</netty.version>
+    <netty.version>4.1.113.Final</netty.version>
     <log4j.version>2.23.1</log4j.version>
 
     <!-- This allows you to test feature branches with jitpack -->
@@ -92,14 +92,14 @@
     <okhttp.version>4.12.0</okhttp.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.12.0</mockito.version>
+    <awaitility.version>4.2.2</awaitility.version>
+    <junit-jupiter.version>5.11.0</junit-jupiter.version>
+    <mockito.version>5.13.0</mockito.version>
 
     <!-- override to set exclusions per-project -->
     <errorprone.args />
-    <errorprone.version>2.27.1</errorprone.version>
-    <auto-value.version>1.10.4</auto-value.version>
+    <errorprone.version>2.30.0</errorprone.version>
+    <auto-value.version>1.11.0</auto-value.version>
 
     <license.skip>${skipTests}</license.skip>
 
@@ -108,22 +108,22 @@
 
     <go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
     <!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
-    <license-maven-plugin.version>4.3</license-maven-plugin.version>
+    <license-maven-plugin.version>4.5</license-maven-plugin.version>
     <maven-bundle-plugin.version>5.1.9</maven-bundle-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>
+    <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
     <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
     <!-- Use same version as https://github.com/openzipkin/docker-java -->
     <maven-help-plugin.version>3.4.0</maven-help-plugin.version>
-    <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
+    <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
     <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-    <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+    <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-    <maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
+    <maven-shade-plugin.version>3.6.0</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>
+    <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
   </properties>
 
@@ -175,7 +175,7 @@
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>junit-jupiter-api</artifactId>
       <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>