From 89c589dbc80d0fec7d70e47e491e3ab6288ee897 Mon Sep 17 00:00:00 2001
From: Andriy Redko <drreta@gmail.com>
Date: Thu, 23 May 2024 16:42:10 -0400
Subject: [PATCH] Update to Spring Boot 3.3.0

Signed-off-by: Andriy Redko <drreta@gmail.com>
---
 benchmarks/pom.xml                         |  2 +-
 docker/test-images/zipkin-mysql/Dockerfile |  2 +-
 pom.xml                                    |  6 +++---
 zipkin-collector/activemq/pom.xml          |  2 +-
 zipkin-collector/core/pom.xml              |  2 +-
 zipkin-collector/kafka/pom.xml             |  2 +-
 zipkin-collector/pom.xml                   |  2 +-
 zipkin-collector/rabbitmq/pom.xml          |  2 +-
 zipkin-collector/scribe/pom.xml            |  2 +-
 zipkin-junit5/pom.xml                      |  2 +-
 zipkin-lens/pom.xml                        |  2 +-
 zipkin-server/pom.xml                      | 15 ++++++++++++++-
 zipkin-storage/cassandra/pom.xml           |  2 +-
 zipkin-storage/elasticsearch/pom.xml       |  2 +-
 zipkin-storage/mysql-v1/pom.xml            |  2 +-
 zipkin-storage/pom.xml                     |  2 +-
 zipkin-tests/pom.xml                       |  2 +-
 zipkin/pom.xml                             |  2 +-
 18 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 617c39ee6d..ac1a9163cc 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>
diff --git a/docker/test-images/zipkin-mysql/Dockerfile b/docker/test-images/zipkin-mysql/Dockerfile
index 994bbaff85..60482dbc64 100644
--- a/docker/test-images/zipkin-mysql/Dockerfile
+++ b/docker/test-images/zipkin-mysql/Dockerfile
@@ -28,7 +28,7 @@ HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthche
 ENTRYPOINT ["start-mysql"]
 
 # Use latest from https://pkgs.alpinelinux.org/packages?name=mysql (without the -r[0-9])
-ARG mysql_version=10.11.7
+ARG mysql_version=10.11.8-r0
 LABEL mysql-version=$mysql_version
 ENV MYSQL_VERSION=$mysql_version
 
diff --git a/pom.xml b/pom.xml
index 8410c544dc..34aefa4e6e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>io.zipkin</groupId>
   <artifactId>zipkin-parent</artifactId>
-  <version>3.3.1-SNAPSHOT</version>
+  <version>3.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -61,8 +61,8 @@
     <javax-annotation-api.version>1.3.2</javax-annotation-api.version>
 
     <!-- update together -->
-    <spring-boot.version>3.2.5</spring-boot.version>
-    <spring.version>6.1.6</spring.version>
+    <spring-boot.version>3.3.0</spring-boot.version>
+    <spring.version>6.1.8</spring.version>
 
     <!-- MySQL connector is GPL, even if it has an OSS exception.
          https://www.mysql.com/about/legal/licensing/foss-exception/
diff --git a/zipkin-collector/activemq/pom.xml b/zipkin-collector/activemq/pom.xml
index 304a9f155a..444fe6027d 100644
--- a/zipkin-collector/activemq/pom.xml
+++ b/zipkin-collector/activemq/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-activemq</artifactId>
diff --git a/zipkin-collector/core/pom.xml b/zipkin-collector/core/pom.xml
index 9d2716530d..74e21c456b 100644
--- a/zipkin-collector/core/pom.xml
+++ b/zipkin-collector/core/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector</artifactId>
diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml
index 1584818036..3a505b38e4 100644
--- a/zipkin-collector/kafka/pom.xml
+++ b/zipkin-collector/kafka/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-kafka</artifactId>
diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml
index 80042bf446..c49bdf98f4 100644
--- a/zipkin-collector/pom.xml
+++ b/zipkin-collector/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>
diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml
index 883b24bc7e..348528caa7 100644
--- a/zipkin-collector/rabbitmq/pom.xml
+++ b/zipkin-collector/rabbitmq/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-rabbitmq</artifactId>
diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml
index 7b6df43ff7..d96288cfb8 100644
--- a/zipkin-collector/scribe/pom.xml
+++ b/zipkin-collector/scribe/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-collector-scribe</artifactId>
diff --git a/zipkin-junit5/pom.xml b/zipkin-junit5/pom.xml
index d0097749eb..c421a2f293 100644
--- a/zipkin-junit5/pom.xml
+++ b/zipkin-junit5/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>
diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml
index e8f734ca46..e179116aed 100644
--- a/zipkin-lens/pom.xml
+++ b/zipkin-lens/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-lens</artifactId>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index cd803c2abf..a3578fb290 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-server</artifactId>
@@ -392,6 +392,19 @@
       <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- Needed by ZipkinHttpClientSender -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>${project.groupId}.zipkin2</groupId>
diff --git a/zipkin-storage/cassandra/pom.xml b/zipkin-storage/cassandra/pom.xml
index 757e0c1a10..25e7d4fd85 100644
--- a/zipkin-storage/cassandra/pom.xml
+++ b/zipkin-storage/cassandra/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-storage-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-storage-cassandra</artifactId>
diff --git a/zipkin-storage/elasticsearch/pom.xml b/zipkin-storage/elasticsearch/pom.xml
index f867c5bb8c..d9396f57e6 100644
--- a/zipkin-storage/elasticsearch/pom.xml
+++ b/zipkin-storage/elasticsearch/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-storage-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-storage-elasticsearch</artifactId>
diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml
index f41ddcbd14..bebc2ed87e 100644
--- a/zipkin-storage/mysql-v1/pom.xml
+++ b/zipkin-storage/mysql-v1/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin.zipkin2</groupId>
     <artifactId>zipkin-storage-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-storage-mysql-v1</artifactId>
diff --git a/zipkin-storage/pom.xml b/zipkin-storage/pom.xml
index 2bebce4588..cb1a0c0859 100644
--- a/zipkin-storage/pom.xml
+++ b/zipkin-storage/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>
diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml
index b96f588d0d..85f71a4430 100644
--- a/zipkin-tests/pom.xml
+++ b/zipkin-tests/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index 42b1a56878..46bbafdf19 100644
--- a/zipkin/pom.xml
+++ b/zipkin/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.zipkin</groupId>
     <artifactId>zipkin-parent</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.4.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.zipkin.zipkin2</groupId>