diff --git a/docker/test-images/zipkin-mysql/Dockerfile b/docker/test-images/zipkin-mysql/Dockerfile index 994bbaff85..e1a7058798 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 LABEL mysql-version=$mysql_version ENV MYSQL_VERSION=$mysql_version diff --git a/pom.xml b/pom.xml index 8410c544dc..4bc93d8148 100755 --- a/pom.xml +++ b/pom.xml @@ -47,29 +47,29 @@ 1.0.0 com.linecorp.armeria - 1.28.2 + 1.28.4 - 4.1.109.Final + 4.1.110.Final - 2.17.0 + 2.17.1 - 4.18.0 - 1.12.5 + 4.18.1 + 1.13.0 1.3.2 - 3.2.5 - 6.1.6 + 3.3.0 + 6.1.8 - 3.3.3 + 3.4.0 5.1.0 2.0.13 1.10.4 @@ -77,15 +77,15 @@ 5.10.2 - 5.11.0 + 5.12.0 3.25.3 4.2.1 - 1.19.7 + 1.19.8 4.12.0 5.6.0 4.9.9 - 2.10.1 + 2.11.0 ${project.build.directory}/test/proto ${skipTests} @@ -93,7 +93,7 @@ 3.5.0 1.2.8 - 4.3 + 4.5 3.7.1 5.1.9 3.13.0 diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml index cd803c2abf..6831e3d2bf 100644 --- a/zipkin-server/pom.xml +++ b/zipkin-server/pom.xml @@ -161,7 +161,10 @@ io.micrometer micrometer-registry-prometheus - + + io.micrometer + micrometer-registry-prometheus-simpleclient + com.netflix.concurrency-limits concurrency-limits-core @@ -392,6 +395,19 @@ ${spring.version} test + + + org.springframework + spring-web + ${spring.version} + + + * + * + + + test + ${project.groupId}.zipkin2 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 @@ ${project.basedir}/../.. - 3.19.7 + 3.19.8 -Xep:InconsistentCapitalization:OFF 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 @@ com.google.code.gson:gson + com/google/gson/Strictness.class com/google/gson/stream/JsonReader*.class com/google/gson/stream/JsonToken.class com/google/gson/stream/MalformedJsonException.class com/google/gson/internal/JsonReaderInternalAccess.class + com/google/gson/internal/TroubleshootingGuide.class