Update Spring Boot to 3.4.1 and other dependency updates (#3787)

Update Spring Boot to 3.4.1 and other dependency updates --------- Signed-off-by: Andriy Redko <[email protected]>
openzipkin · Jan 6, 2025 · bf6ab5a · bf6ab5a
1 parent ea2da72
commit bf6ab5a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/docker/test-images/zipkin-eureka/pom.xml b/docker/test-images/zipkin-eureka/pom.xml
@@ -29,7 +29,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.3.6</version>
+        <version>3.4.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-      <version>4.1.3</version>
+      <version>4.2.0</version>
       <exclusions>
         <!-- dodge spring-jcl conflict error -->
         <exclusion>

diff --git a/pom.xml b/pom.xml
@@ -47,42 +47,42 @@
     <zipkin-proto3.version>1.0.0</zipkin-proto3.version>
 
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
-    <armeria.version>1.31.0</armeria.version>
+    <armeria.version>1.31.3</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
-    <netty.version>4.1.115.Final</netty.version>
+    <netty.version>4.1.116.Final</netty.version>
 
     <!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
-    <jackson.version>2.17.2</jackson.version>
+    <jackson.version>2.18.2</jackson.version>
 
     <java-driver.version>4.18.1</java-driver.version>
-    <micrometer.version>1.13.4</micrometer.version>
+    <micrometer.version>1.14.2</micrometer.version>
 
     <!-- Used for Generated annotations -->
     <javax-annotation-api.version>1.3.2</javax-annotation-api.version>
 
     <!-- update together -->
-    <spring-boot.version>3.3.6</spring-boot.version>
-    <spring.version>6.1.15</spring.version>
+    <spring-boot.version>3.4.1</spring-boot.version>
+    <spring.version>6.2.1</spring.version>
 
     <!-- MySQL connector is GPL, even if it has an OSS exception.
          https://www.mysql.com/about/legal/licensing/foss-exception/
 
          MariaDB has a friendlier license, LGPL, which is less scary in audits.
     -->
-    <mariadb-java-client.version>3.4.1</mariadb-java-client.version>
+    <mariadb-java-client.version>3.5.1</mariadb-java-client.version>
     <HikariCP.version>5.1.0</HikariCP.version>
     <slf4j.version>2.0.16</slf4j.version>
     <auto-value.version>1.11.0</auto-value.version>
     <git-commit-id.version>4.9.10</git-commit-id.version>
 
     <!-- Test only dependencies -->
-    <junit-jupiter.version>5.11.2</junit-jupiter.version>
-    <mockito.version>5.14.1</mockito.version>
-    <assertj.version>3.26.3</assertj.version>
+    <junit-jupiter.version>5.11.4</junit-jupiter.version>
+    <mockito.version>5.15.2</mockito.version>
+    <assertj.version>3.27.2</assertj.version>
     <awaitility.version>4.2.2</awaitility.version>
     <testcontainers.version>1.20.2</testcontainers.version>
     <okhttp.version>4.12.0</okhttp.version>
-    <kryo.version>5.6.1</kryo.version>
+    <kryo.version>5.6.2</kryo.version>
     <!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
     <wire.version>5.1.0</wire.version>
     <gson.version>2.11.0</gson.version>

diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
@@ -27,7 +27,7 @@
 
     <!-- Sometimes we need to override Armeria's Brave version -->
     <brave.version>6.0.3</brave.version>
-    <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
+    <zipkin-reporter.version>3.4.3</zipkin-reporter.version>
     <log4j.version>2.23.1</log4j.version>
     <proto.generatedSourceDirectory>${project.build.directory}/generated-test-sources/wire</proto.generatedSourceDirectory>
   </properties>