From 99a710d8b6419683bde297fd17b719b5b0149f41 Mon Sep 17 00:00:00 2001
From: Andriy Redko <drreta@gmail.com>
Date: Fri, 24 May 2024 08:08:24 -0400
Subject: [PATCH] Update other dependencies

Signed-off-by: Andriy Redko <drreta@gmail.com>
---
 pom.xml                         | 20 ++++++++++----------
 zipkin-server/pom.xml           |  5 ++++-
 zipkin-storage/mysql-v1/pom.xml |  2 +-
 zipkin/pom.xml                  |  2 ++
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index a4566fb5cd..4bc93d8148 100755
--- a/pom.xml
+++ b/pom.xml
@@ -47,15 +47,15 @@
     <zipkin-proto3.version>1.0.0</zipkin-proto3.version>
 
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
-    <armeria.version>1.28.2</armeria.version>
+    <armeria.version>1.28.4</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
-    <netty.version>4.1.109.Final</netty.version>
+    <netty.version>4.1.110.Final</netty.version>
 
     <!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
-    <jackson.version>2.17.0</jackson.version>
+    <jackson.version>2.17.1</jackson.version>
 
-    <java-driver.version>4.18.0</java-driver.version>
-    <micrometer.version>1.12.5</micrometer.version>
+    <java-driver.version>4.18.1</java-driver.version>
+    <micrometer.version>1.13.0</micrometer.version>
 
     <!-- Used for Generated annotations -->
     <javax-annotation-api.version>1.3.2</javax-annotation-api.version>
@@ -69,7 +69,7 @@
 
          MariaDB has a friendlier license, LGPL, which is less scary in audits.
     -->
-    <mariadb-java-client.version>3.3.3</mariadb-java-client.version>
+    <mariadb-java-client.version>3.4.0</mariadb-java-client.version>
     <HikariCP.version>5.1.0</HikariCP.version>
     <slf4j.version>2.0.13</slf4j.version>
     <auto-value.version>1.10.4</auto-value.version>
@@ -77,15 +77,15 @@
 
     <!-- Test only dependencies -->
     <junit-jupiter.version>5.10.2</junit-jupiter.version>
-    <mockito.version>5.11.0</mockito.version>
+    <mockito.version>5.12.0</mockito.version>
     <assertj.version>3.25.3</assertj.version>
     <awaitility.version>4.2.1</awaitility.version>
-    <testcontainers.version>1.19.7</testcontainers.version>
+    <testcontainers.version>1.19.8</testcontainers.version>
     <okhttp.version>4.12.0</okhttp.version>
     <kryo.version>5.6.0</kryo.version>
     <!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
     <wire.version>4.9.9</wire.version>
-    <gson.version>2.10.1</gson.version>
+    <gson.version>2.11.0</gson.version>
     <unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>
 
     <license.skip>${skipTests}</license.skip>
@@ -93,7 +93,7 @@
     <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
     <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-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
     <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index 0c0781a248..6831e3d2bf 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -161,7 +161,10 @@
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-prometheus</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.netflix.concurrency-limits</groupId>
       <artifactId>concurrency-limits-core</artifactId>
diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml
index f41ddcbd14..2b366184ac 100644
--- a/zipkin-storage/mysql-v1/pom.xml
+++ b/zipkin-storage/mysql-v1/pom.xml
@@ -20,7 +20,7 @@
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <jooq.version>3.19.7</jooq.version>
+    <jooq.version>3.19.8</jooq.version>
 
     <!-- jOOQ doesn't add the Generated annotation, so we have to explicitly disable rules -->
     <errorprone.args>-Xep:InconsistentCapitalization:OFF</errorprone.args>
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index 42b1a56878..f47d6184cb 100644
--- a/zipkin/pom.xml
+++ b/zipkin/pom.xml
@@ -71,10 +71,12 @@
                 <filter>
                   <artifact>com.google.code.gson:gson</artifact>
                   <includes>
+                    <include>com/google/gson/Strictness.class</include>
                     <include>com/google/gson/stream/JsonReader*.class</include>
                     <include>com/google/gson/stream/JsonToken.class</include>
                     <include>com/google/gson/stream/MalformedJsonException.class</include>
                     <include>com/google/gson/internal/JsonReaderInternalAccess.class</include>
+                    <include>com/google/gson/internal/TroubleshootingGuide.class</include>
                   </includes>
                 </filter>
               </filters>