From 91976d83578a4a4bd22f2d3ddf637c36d8a27c54 Mon Sep 17 00:00:00 2001
From: Andriy Redko <drreta@gmail.com>
Date: Mon, 26 Aug 2024 13:37:44 -0400
Subject: [PATCH] Update Spring Boot (address CVEs) and few other dependencies
 (#3778)

Update Spring Boot (address CVEs) and few other dependencies (see please
https://spring.io/blog/2024/08/23/spring-boot-releases-fix-for-cve-2024-38807)

Signed-off-by: Andriy Redko <drreta@gmail.com>
---
 docker/test-images/zipkin-mysql/Dockerfile   |  2 +-
 docker/test-images/zipkin-ui/Dockerfile      |  2 +-
 docker/test-images/zipkin-uiproxy/Dockerfile |  2 +-
 pom.xml                                      | 10 +++++-----
 zipkin-collector/scribe/pom.xml              |  7 +++++++
 zipkin-server/pom.xml                        |  7 +++++++
 zipkin-storage/elasticsearch/pom.xml         |  7 +++++++
 7 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/docker/test-images/zipkin-mysql/Dockerfile b/docker/test-images/zipkin-mysql/Dockerfile
index c2cb12d4a9..fbc8b4442c 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=11.4.2
+ARG mysql_version=11.4.3
 LABEL mysql-version=$mysql_version
 ENV MYSQL_VERSION=$mysql_version
 
diff --git a/docker/test-images/zipkin-ui/Dockerfile b/docker/test-images/zipkin-ui/Dockerfile
index 181b7cf45c..dda898f859 100644
--- a/docker/test-images/zipkin-ui/Dockerfile
+++ b/docker/test-images/zipkin-ui/Dockerfile
@@ -52,7 +52,7 @@ RUN if [ "${RELEASE_FROM_MAVEN_BUILD}" == "false" ]; then /build-bin/maybe_insta
 FROM ghcr.io/openzipkin/alpine:$alpine_version as zipkin-ui
 LABEL org.opencontainers.image.description="NGINX on Alpine Linux hosting the Zipkin UI with Zipkin API proxy_pass"
 # Use latest from https://pkgs.alpinelinux.org/packages?name=nginx
-ARG nginx_version=1.26.1
+ARG nginx_version=1.26.2
 LABEL nginx-version=$nginx_version
 
 ENV ZIPKIN_BASE_URL=http://zipkin:9411
diff --git a/docker/test-images/zipkin-uiproxy/Dockerfile b/docker/test-images/zipkin-uiproxy/Dockerfile
index 072fc4d055..3c42c4e24c 100644
--- a/docker/test-images/zipkin-uiproxy/Dockerfile
+++ b/docker/test-images/zipkin-uiproxy/Dockerfile
@@ -28,7 +28,7 @@ COPY docker/test-images/zipkin-uiproxy/nginx.conf /conf.d/zipkin.conf.template
 FROM ghcr.io/openzipkin/alpine:$alpine_version as zipkin-uiproxy
 LABEL org.opencontainers.image.description="NGINX on Alpine Linux proxying the Zipkin UI with proxy_pass"
 # Use latest from https://pkgs.alpinelinux.org/packages?name=nginx
-ARG nginx_version=1.26.1
+ARG nginx_version=1.26.2
 LABEL nginx-version=$nginx_version
 
 ENV ZIPKIN_UI_BASEPATH=/zipkin
diff --git a/pom.xml b/pom.xml
index d55e8a80c7..e21b85fe16 100755
--- a/pom.xml
+++ b/pom.xml
@@ -55,14 +55,14 @@
     <jackson.version>2.17.2</jackson.version>
 
     <java-driver.version>4.18.1</java-driver.version>
-    <micrometer.version>1.13.2</micrometer.version>
+    <micrometer.version>1.13.3</micrometer.version>
 
     <!-- Used for Generated annotations -->
     <javax-annotation-api.version>1.3.2</javax-annotation-api.version>
 
     <!-- update together -->
-    <spring-boot.version>3.3.2</spring-boot.version>
-    <spring.version>6.1.11</spring.version>
+    <spring-boot.version>3.3.3</spring-boot.version>
+    <spring.version>6.1.12</spring.version>
 
     <!-- MySQL connector is GPL, even if it has an OSS exception.
          https://www.mysql.com/about/legal/licensing/foss-exception/
@@ -76,7 +76,7 @@
     <git-commit-id.version>4.9.10</git-commit-id.version>
 
     <!-- Test only dependencies -->
-    <junit-jupiter.version>5.10.3</junit-jupiter.version>
+    <junit-jupiter.version>5.11.0</junit-jupiter.version>
     <mockito.version>5.12.0</mockito.version>
     <assertj.version>3.26.3</assertj.version>
     <awaitility.version>4.2.1</awaitility.version>
@@ -109,7 +109,7 @@
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
     <maven-shade-plugin.version>3.5.3</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.4.0</maven-surefire-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
     <wire-maven-plugin.version>1.3</wire-maven-plugin.version>
   </properties>
diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml
index a94075816a..24c0a7e258 100644
--- a/zipkin-collector/scribe/pom.xml
+++ b/zipkin-collector/scribe/pom.xml
@@ -58,5 +58,12 @@
       <version>${awaitility.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index c8ed0e2dd4..cec5d4133c 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -349,6 +349,13 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.linecorp.armeria</groupId>
       <artifactId>armeria-junit5</artifactId>
diff --git a/zipkin-storage/elasticsearch/pom.xml b/zipkin-storage/elasticsearch/pom.xml
index 9f1181e19a..96c47d74c3 100644
--- a/zipkin-storage/elasticsearch/pom.xml
+++ b/zipkin-storage/elasticsearch/pom.xml
@@ -56,5 +56,12 @@
       <version>${armeria.version}</version>
       <scope>test</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>