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 @@ 2.17.2 4.18.1 - 1.13.2 + 1.13.3 1.3.2 - 3.3.2 - 6.1.11 + 3.3.3 + 6.1.12 - 5.10.3 + 5.11.0 5.12.0 3.26.3 4.2.1 @@ -109,7 +109,7 @@ 3.0.1 3.5.3 3.3.1 - 3.2.5 + 3.4.0 1.6.13 1.3 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 @@ ${awaitility.version} test + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + 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 @@ + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + + com.linecorp.armeria armeria-junit5 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 @@ ${armeria.version} test + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test +