Merge branch '1.11.x' into 1.12.x

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ aspectjweaver = "1.9.20.1"
 assertj = "3.24.2"
 awaitility = "4.2.0"
 # legacy SDK
-aws-cloudwatch = "1.12.586"
+aws-cloudwatch = "1.12.593"
 caffeine = "2.9.3"
 cloudwatch2 = "2.21.20"
 colt = "1.2.0"
@@ -69,10 +69,10 @@ rest-assured = "5.3.2"
 signalfx = "1.0.36"
 slf4j = "1.7.36"
 spectator-atlas = "1.7.2"
-spring = "5.3.30"
-spring-javaformat = "0.0.39"
-testcontainers = "1.19.1"
-tomcat = "8.5.95"
+spring = "5.3.31"
+spring-javaformat = "0.0.40"
+testcontainers = "1.19.2"
+tomcat = "8.5.96"
 wavefront = "3.4.3"
 # pinned to avoid issues with shaded slf4j version - see gh-3414
 wiremock = "2.33.2"
@@ -190,7 +190,7 @@ spring-context = { module = "org.springframework:spring-context", version.ref =
 spring-core = { module = "org.springframework:spring-core", version.ref = "spring" }
 spring-cloud = { module = "org.springframework.cloud:spring-cloud-dependencies", version = "2021.0.8" }
 spring-javaformatCheckstyle = { module = "io.spring.javaformat:spring-javaformat-checkstyle", version.ref = "spring-javaformat" }
-systemStubsJupiter = { module = "uk.org.webcompere:system-stubs-jupiter", version = "2.1.4" }
+systemStubsJupiter = { module = "uk.org.webcompere:system-stubs-jupiter", version = "2.1.5" }
 testcontainers-junitJupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
 testcontainers-kafka = { module = "org.testcontainers:kafka", version.ref = "testcontainers" }
 testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }